diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-15 15:41:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-15 15:55:24 +0200 |
commit | 9e89bc37edfcd1b4b0a22c096c6546df4a9d1c0b (patch) | |
tree | de31fc8aa5b32d28a0143aff2477b4c3ada40318 /libavcodec/w32pthreads.h | |
parent | aee7b88cc0675fb668e39e8f4a50f2b1bd9305d4 (diff) | |
parent | 635ac8e1be91e941908f85642e4bbb609e48193f (diff) | |
download | ffmpeg-streaming-9e89bc37edfcd1b4b0a22c096c6546df4a9d1c0b.zip ffmpeg-streaming-9e89bc37edfcd1b4b0a22c096c6546df4a9d1c0b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add support for SWFVerification
api-example: use new video encoding API.
x86: avcodec: Appropriately name files containing only init functions
mpegvideo_mmx_template: drop some commented-out cruft
libavresample: add mix level normalization option
w32pthreads: Add missing #includes to make header compile standalone
rtmp: Gracefully ignore _checkbw errors by tracking them
rtmp: Do not send _checkbw calls as notifications
prores: interlaced ProRes encoding
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/proresenc_kostya.c
libavcodec/w32pthreads.h
libavcodec/x86/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/w32pthreads.h')
-rw-r--r-- | libavcodec/w32pthreads.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index fbc183a..c4bbb9a 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -40,6 +40,8 @@ #include <process.h> #include "libavutil/common.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" typedef struct { void *handle; |