diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-25 19:38:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-25 19:39:00 +0100 |
| commit | 8f20e3d4dfe5d54e36113e679bd1350e4550bc4d (patch) | |
| tree | b6f12b74cfb5d2a136ea71b61e0b36e52e47c933 /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 41e7e46cac507e993af6d656c8d3672ba3f9e304 (diff) | |
| parent | dc0c70e018f6b04488333e7e26ec26359e614e4e (diff) | |
| download | ffmpeg-8f20e3d4dfe5d54e36113e679bd1350e4550bc4d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: add missing includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
| -rw-r--r-- | libavcodec/mjpeg2jpeg_bsf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c index f3672881bc..6adeaf0ac8 100644 --- a/libavcodec/mjpeg2jpeg_bsf.c +++ b/libavcodec/mjpeg2jpeg_bsf.c @@ -25,6 +25,10 @@ */ #include <string.h> + +#include "libavutil/error.h" +#include "libavutil/mem.h" + #include "avcodec.h" #include "mjpeg.h" |