avformat/mpegts: favor DESC_types over probed codecs
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 01:15:55 +0000 (03:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 01:22:34 +0000 (03:22 +0200)
Fixes Ticket3766
Fixes dvb_teletext detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c

index a118689..1e18813 100644 (file)
@@ -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);