From 42507534977e2108e397a381357ee2db209475f6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 1 Sep 2014 03:15:55 +0200 Subject: [PATCH] avformat/mpegts: favor DESC_types over probed codecs Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a1186895df..1e18813a48 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1511,7 +1511,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len); - if (st->codec->codec_id == AV_CODEC_ID_NONE && + if ((st->codec->codec_id == AV_CODEC_ID_NONE || st->request_probe > 0) && stream_type == STREAM_TYPE_PRIVATE_DATA) mpegts_find_stream_type(st, desc_tag, DESC_types); -- 2.11.0