lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge commit '90f9a5830b'

Browse source 
* commit '90f9a5830b':
  w32pthreads: move from lavc to compat/

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-24 12:32:18 +02:00
commit a4d3757b29
7 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/frame_thread_encoder.c
View file

@ -30,7 +30,7 @@
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "w32pthreads.h"
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "os2threads.h"
#endif