[FFmpeg-cvslog] avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample

Michael Niedermayer git at videolan.org
Mon Aug 24 19:51:09 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Aug 24 19:19:37 2015 +0200| [fa9af304f0a167f187a26cc9a0a0ba6a4db08cbe] | committer: Michael Niedermayer

avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample

Ticket4770 contains such a sample and it decodes fine

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa9af304f0a167f187a26cc9a0a0ba6a4db08cbe
---

 libavcodec/mjpegdec.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 039fe0e..818f8c9 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -288,9 +288,6 @@ 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");
-
     // HACK for odd_height.mov
     if (s->interlaced && s->width == width && s->height == height + 1)
         height= s->height;



More information about the ffmpeg-cvslog mailing list