aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-01 03:53:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-01 04:00:47 +0200
commit149be913741fcefece3be448f9268217479c6906 (patch)
treee6408bb28a360dd26b0d34c9e5b8f2b40fb74506
parente1bd40fe6beb74a942b7b0cff2d077750a7e733e (diff)
downloadffmpeg-149be913741fcefece3be448f9268217479c6906.tar.gz
avcodec/mjpegdec: request a AMV sample with non mod 16 height
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ccbdf489a4..6636dadb50 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -264,6 +264,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
height = get_bits(&s->gb, 16);
width = get_bits(&s->gb, 16);
+ if (s->avctx->codec_id == AV_CODEC_ID_AMV && (height&15))
+ avpriv_request_sample(s->avctx, "non mod 16 height AMV\n");
+
// HACK for odd_height.mov
if (s->interlaced && s->width == width && s->height == height + 1)
height= s->height;