diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:01:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:01:58 +0200 |
| commit | 854fa0d1ab35c18764e020828531b4ababa67e6c (patch) | |
| tree | 73de8ebfe730b609d1bcbba27c5d5af5f6543851 /libavcodec | |
| parent | 5d790cdb9ee28f1f72d49f80fdbb257ba5258ab8 (diff) | |
| parent | e24d1cbc4e134e0b4448b3bc3a80f3197271b347 (diff) | |
| download | ffmpeg-854fa0d1ab35c18764e020828531b4ababa67e6c.tar.gz | |
Merge commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347' into release/0.10
* commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347':
lavf: Fix leftovers from the ff_get_buffer patch
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mxpegdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/roqvideoenc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 636dd7076e..5c09780112 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -28,6 +28,7 @@ #include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" +#include "internal.h" typedef struct MXpegDecodeContext { MJpegDecodeContext jpg; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 8ecb23c26b..a3c99870a0 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -61,6 +61,7 @@ #include "elbg.h" #include "internal.h" #include "mathops.h" +#include "internal.h" #define CHROMA_BIAS 1 |