From d9b89b23df4f63d67694507f3d1caee62424a9d8 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 19 Dec 2011 10:41:22 -0800 Subject: mpegts: Fix typo in handling sections in the PMT. This was an error rebasing 4682a1dc3aa2554ad7077f5db32d0f2d598d018e for commit. The "pes" variable guaranteed to be NULL in that block. --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/mpegts.c') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ca01003d80..2356fa8935 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1460,7 +1460,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (idx >= 0) { st = ts->stream->streams[idx]; } else { - st = avformat_new_stream(pes->stream, NULL); + st = avformat_new_stream(ts->stream, NULL); st->id = pid; st->codec->codec_type = AVMEDIA_TYPE_DATA; } -- cgit v1.2.3 From 41bdd4adc4ab90a5ef7d63050a4046fcba711365 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 19 Dec 2011 10:48:57 -0800 Subject: mpegts: Suppress invalid timebase warnings on DMB streams. timestamp_len and timestamp_res intialize to zero. --- libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/mpegts.c') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 2356fa8935..15688a9747 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -732,7 +732,8 @@ static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf if (cts != AV_NOPTS_VALUE) pes->pts = cts; - avpriv_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res); + if (sl->timestamp_len && sl->timestamp_res) + avpriv_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res); return (get_bits_count(&gb) + 7) >> 3; } -- cgit v1.2.3