diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 15:46:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 15:46:31 +0100 |
| commit | cab5315519ff8172f3b07dbcc4d4829ae567b1a9 (patch) | |
| tree | 581de8554c6b51196f7b8a06805bb6a0af9e4e93 /libavcodec/mjpegdec.h | |
| parent | c1362ca0479eedc6171306276f6ed4baa7e9882f (diff) | |
| parent | d48132b7de7601c8c2769c0e92a43baa7759b991 (diff) | |
| download | ffmpeg-streaming-cab5315519ff8172f3b07dbcc4d4829ae567b1a9.zip ffmpeg-streaming-cab5315519ff8172f3b07dbcc4d4829ae567b1a9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mjpegdec: apply flipping after decoding, not before
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 1335c66..79a95f5 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -30,6 +30,7 @@ #define AVCODEC_MJPEGDEC_H #include "libavutil/log.h" +#include "libavutil/pixdesc.h" #include "avcodec.h" #include "get_bits.h" @@ -120,6 +121,8 @@ typedef struct MJpegDecodeContext { int extern_huff; AVDictionary *exif_metadata; + + const AVPixFmtDescriptor *pix_desc; } MJpegDecodeContext; int ff_mjpeg_decode_init(AVCodecContext *avctx); |
