From 19e5114eaad9631a4a7431a96857a0b03e164717 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 Jul 2014 18:49:18 +0200 Subject: [PATCH] avcodec/mpegvideo_enc: return proper error instead of failing assertion when max rate is not set Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 56867ccb85..9c4f2a5d11 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -388,8 +388,7 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) if ((!avctx->rc_max_rate) != (!avctx->rc_buffer_size)) { av_log(avctx, AV_LOG_ERROR, "Either both buffer size and max rate or neither must be specified\n"); - if (avctx->rc_max_rate && !avctx->rc_buffer_size) - return -1; + return -1; } if (avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate) {