From 33931016e51c0c928651996ce28b086dfb7b9385 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Wed, 13 Jan 2010 22:23:29 +0000 Subject: [PATCH] use codec rc_max_rate if set and warn if bit rate is not set Originally committed as revision 21204 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpegtsenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index be30e68a84..9b12af7ecb 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -425,7 +425,16 @@ static int mpegts_write_header(AVFormatContext *s) if (st->codec->codec_type == CODEC_TYPE_VIDEO && service->pcr_pid == 0x1fff) service->pcr_pid = ts_st->pid; - total_bit_rate += st->codec->bit_rate; + if (st->codec->rc_max_rate) + total_bit_rate += st->codec->rc_max_rate; + else { + if (!st->codec->bit_rate) { + av_log(s, AV_LOG_WARNING, + "stream %d, bit rate is not set, this will cause problems\n", + st->index); + } + total_bit_rate += st->codec->bit_rate; + } /* PES header size */ if (st->codec->codec_type == CODEC_TYPE_VIDEO || st->codec->codec_type == CODEC_TYPE_SUBTITLE) {