summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-10-07 01:57:39 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-10-07 01:57:39 +0000
commit34b9e5bc4f90ddfe559fe77b2b50e090b64ebe75 (patch)
tree8b2dc7da9b665ca7585440444025a2788a7088d1
parent2dec2bb88074b580d67ecfab037668bed964ae4a (diff)
downloadffmpeg-streaming-34b9e5bc4f90ddfe559fe77b2b50e090b64ebe75.zip
ffmpeg-streaming-34b9e5bc4f90ddfe559fe77b2b50e090b64ebe75.tar.gz
Warn if muxing mpeg ps is attempted without a VBV buffer size.
Originally committed as revision 25385 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index f94b9fa..9580ca2 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -367,8 +367,10 @@ static int mpeg_mux_init(AVFormatContext *ctx)
stream->id = mpv_id++;
if (st->codec->rc_buffer_size)
stream->max_buffer_size = 6*1024 + st->codec->rc_buffer_size/8;
- else
+ else{
+ av_log(ctx, AV_LOG_WARNING, "VBV buffer size not set, muxing may fail\n");
stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default
+ }
#if 0
/* see VCD standard, p. IV-7*/
stream->max_buffer_size = 46 * 1024;
OpenPOWER on IntegriCloud