diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 13:12:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 13:33:11 +0200 |
| commit | 909f53f2b285bc7dbe77d4690a03f3d114417297 (patch) | |
| tree | 872502c1e1e6e9d7b16b422023f4269ce24d6236 /libavcodec/ljpegenc.c | |
| parent | a97137e9486964918a71f1a760cdcc297bf61b59 (diff) | |
| parent | adcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff) | |
Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
mjpeg: Split off bits shared by MJPEG and LJPEG encoders
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
| -rw-r--r-- | libavcodec/ljpegenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 9b9f5dcf7b..e2e4c76be1 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -37,6 +37,7 @@ #include "avcodec.h" #include "dsputil.h" #include "internal.h" +#include "mjpegenc_common.h" #include "mpegvideo.h" #include "mjpeg.h" #include "mjpegenc.h" |