[FFmpeg-cvslog] mpegvideoenc: Fail if a buffer size is specified without a max rate.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 18 05:36:23 2012 +0100| [f21b6159cf3110a5f018d6addf7382840d427199] | committer: Michael Niedermayer

mpegvideoenc: Fail if a buffer size is specified without a max rate.

This combination makes not much sense.

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

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

 libavcodec/mpegvideo_enc.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index fd31edc..45dcea0 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;
     }