From efdccce500de7dbd91a8f35fabdd8ccbed4d7064 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 8 Jul 2010 22:01:31 +0000 Subject: [PATCH] In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate Originally committed as revision 24125 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpegtsenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 08ede68ace..af019ca47a 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -510,13 +510,15 @@ static int mpegts_write_header(AVFormatContext *s) ts->pat_packet_count = ts->pat_packet_period-1; ts->sdt_packet_count = ts->sdt_packet_period-1; - av_log(s, AV_LOG_INFO, - "muxrate %d bps, pcr every %d pkts, " + if (ts->mux_rate == 1) + av_log(s, AV_LOG_INFO, "muxrate VBR, "); + else + av_log(s, AV_LOG_INFO, "muxrate %d, ", ts->mux_rate); + av_log(s, AV_LOG_INFO, "pcr every %d pkts, " "sdt every %d, pat/pmt every %d pkts\n", - ts->mux_rate, service->pcr_packet_period, + service->pcr_packet_period, ts->sdt_packet_period, ts->pat_packet_period); - put_flush_packet(s->pb); return 0;