From f21b6159cf3110a5f018d6addf7382840d427199 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Jan 2012 05:36:23 +0100 Subject: [PATCH] mpegvideoenc: Fail if a buffer size is specified without a max rate. This combination makes not much sense. Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index fd31edc481..45dcea076b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -392,10 +392,8 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) s->obmc = !!(s->flags & CODEC_FLAG_OBMC); #endif - if (avctx->rc_max_rate && !avctx->rc_buffer_size) { - av_log(avctx, AV_LOG_ERROR, - "a vbv buffer size is needed, " - "for encoding with a maximum bitrate\n"); + 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; }