From c450cf1572e352ce8cf741247b191d213e230bd3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 2 Apr 2012 02:58:08 +0200 Subject: [PATCH] libavcodec: be less picky on nonsense rc_max_rate / rc_buffer_size combinations. Some applications use these combinations and to maintain ABI compatibility with previous versions we should not suddenly fail. Thus only display a warning for the newly detected cases Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 17a2512554..780bbd59d7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -390,7 +390,8 @@ 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"); - return -1; + if (avctx->rc_max_rate && !avctx->rc_buffer_size) + return -1; } if (avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate) {