diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:02:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:11:02 +0200 |
| commit | a105931d3edfd47f287e47e858ef080f0199cd47 (patch) | |
| tree | e9657f4a68b5b33a9a17877cdcd0ca368778f37a /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 48183f144d1d6f7af8e8526a2e020a6a88ad38c0 (diff) | |
| parent | 4978850ca2cb1ec6908f5bc79cc592ca454d11e8 (diff) | |
| download | ffmpeg-a105931d3edfd47f287e47e858ef080f0199cd47.tar.gz | |
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
build: Split JPEG-related tables off into a separate component
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
| -rw-r--r-- | libavcodec/mjpeg2jpeg_bsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c index 6adeaf0ac8..68640db9e6 100644 --- a/libavcodec/mjpeg2jpeg_bsf.c +++ b/libavcodec/mjpeg2jpeg_bsf.c @@ -30,7 +30,7 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "mjpeg.h" +#include "jpegtables.h" static const uint8_t jpeg_header[] = { 0xff, 0xd8, // SOI |