[FFmpeg-cvslog] libavcodec: be less picky on nonsense rc_max_rate / rc_buffer_size combinations.

Michael Niedermayer git at videolan.org
Mon Apr 2 10:39:00 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  2 02:58:08 2012 +0200| [c450cf1572e352ce8cf741247b191d213e230bd3] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

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

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

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 17a2512..780bbd5 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) {



More information about the ffmpeg-cvslog mailing list