[FFmpeg-cvslog] avcodec/mpegvideo_enc: check qmin/qmax

Michael Niedermayer git at videolan.org
Wed Sep 25 00:50:21 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 00:44:17 2013 +0200| [bb4b041df351e49a0fa16007fb4505adea0836d8] | committer: Michael Niedermayer

avcodec/mpegvideo_enc: check qmin/qmax

Fixes Ticket2990

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mpegvideo_enc.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 2e6acb2..a85cf56 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -629,6 +629,11 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
         s->inter_quant_bias = -(1 << (QUANT_BIAS_SHIFT - 2));
     }
 
+    if (avctx->qmin > avctx->qmax || avctx->qmin <= 0) {
+        av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are invalid, they must be 0 < min <= max\n");
+        return AVERROR(EINVAL);
+    }
+
     if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
         s->intra_quant_bias = avctx->intra_quant_bias;
     if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)



More information about the ffmpeg-cvslog mailing list