generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc,lavfi: use avutil/thread.h instead of redundant conditional includes

Browse Source 
This was somehow forgotten in a8bb81a05c.
This commit is contained in:
Clément Bœsch 2016-01-20 21:36:10 +01:00
parent 4590811fc2
commit a362015641
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/pthread_slice.c
View File

@ -24,14 +24,6 @@
#include "config.h" #include "config.h"
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#endif
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "pthread_internal.h" #include "pthread_internal.h"
@ -41,6 +33,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/thread.h"
typedef int (action_func)(AVCodecContext *c, void *arg); typedef int (action_func)(AVCodecContext *c, void *arg);
typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr); typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr);

9
libavfilter/pthread.c
View File

@ -27,19 +27,12 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/thread.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#endif
typedef struct ThreadContext { typedef struct ThreadContext {
AVFilterGraph *graph; AVFilterGraph *graph;