avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 00:39:38 +0000 (02:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 00:53:06 +0000 (02:53 +0200)
commitdde6b2a3554553434c9e3435de3c7e94c3affe03
treed37b979d46cceae3bfa77f5dfdec1c2bd8c01a0d
parent9b747500f361305d4175b137394f233845cb7d54
avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

Fixes Ticket4535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h