apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-23 17:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

Browse Source 
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  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
parent ecbd96ed23 90f9a5830b
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/pthread.c
View File

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