[FFmpeg-devel] [PATCH] avcodec/mjpegenc: remove non mod 16 check, theres a amv file that is not mod 16 == 0

Michael Niedermayer michaelni at gmx.at
Mon Aug 24 20:18:59 CEST 2015


From: Michael Niedermayer <michael at niedermayer.cc>

See Ticket 4770

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/mjpegenc.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index ee0b16e..ae0c8cb 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -228,15 +228,6 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
     if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
         return AVERROR(EINVAL);
 
-    if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
-        av_log(avctx, AV_LOG_ERROR,
-               "Heights which are not a multiple of 16 might fail with some decoders, "
-               "use vstrict=-1 / -strict -1 to use %d anyway.\n", avctx->height);
-        av_log(avctx, AV_LOG_WARNING, "If you have a device that plays AMV videos, please test if videos "
-               "with such heights work with it and report your findings to ffmpeg-devel at ffmpeg.org\n");
-        return AVERROR_EXPERIMENTAL;
-    }
-
     pic = av_frame_clone(pic_arg);
     if (!pic)
         return AVERROR(ENOMEM);
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list