diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 02:39:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 02:53:06 +0200 |
| commit | dde6b2a3554553434c9e3435de3c7e94c3affe03 (patch) | |
| tree | d37b979d46cceae3bfa77f5dfdec1c2bd8c01a0d /libavcodec/mjpegdec.h | |
| parent | 9b747500f361305d4175b137394f233845cb7d54 (diff) | |
| download | ffmpeg-dde6b2a3554553434c9e3435de3c7e94c3affe03.tar.gz | |
avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material
Fixes Ticket4535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 28d3e4aa7d..fb811294a1 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -114,6 +114,7 @@ typedef struct MJpegDecodeContext { int buggy_avid; int cs_itu601; int interlace_polarity; + int multiscope; int mjpb_skiptosod; |