Commit 42507534 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mpegts: favor DESC_types over probed codecs

Fixes Ticket3766
Fixes dvb_teletext detection
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b627385b
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment