[FFmpeg-cvslog] r21204 - trunk/libavformat/mpegtsenc.c
bcoudurier
subversion
Wed Jan 13 23:23:29 CET 2010
Author: bcoudurier
Date: Wed Jan 13 23:23:29 2010
New Revision: 21204
Log:
use codec rc_max_rate if set and warn if bit rate is not set
Modified:
trunk/libavformat/mpegtsenc.c
Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c Wed Jan 13 23:21:45 2010 (r21203)
+++ trunk/libavformat/mpegtsenc.c Wed Jan 13 23:23:29 2010 (r21204)
@@ -425,7 +425,16 @@ static int mpegts_write_header(AVFormatC
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) {
More information about the ffmpeg-cvslog
mailing list