diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 03:15:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 03:22:34 +0200 |
| commit | 42507534977e2108e397a381357ee2db209475f6 (patch) | |
| tree | e28b01011a53cb1646b46b3f6714740c978efde5 | |
| parent | b627385b4bd26bb45da5999fb12a8171fc224115 (diff) | |
| download | ffmpeg-42507534977e2108e397a381357ee2db209475f6.tar.gz | |
avformat/mpegts: favor DESC_types over probed codecs
Fixes Ticket3766
Fixes dvb_teletext detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |