avformat/mpegts: favor DESC_types over probed codecs

Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 4250753497
parent b627385b4b
commit 4250753497
1 changed files with 1 additions and 1 deletions
--- 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);