Skip to content
Snippets Groups Projects
Commit a4d3757b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '90f9a583' 


* commit '90f9a583':
  w32pthreads: move from lavc to compat/

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c
	libavcodec/vp8.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ecbd96ed 90f9a583
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment