diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 23:16:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 23:50:46 +0200 |
| commit | c465254fbf18c9fa133aa5514dc429c2ae15ed3d (patch) | |
| tree | 5c0ee831b7bf8233adbdb2251cfee9234c3f96d1 | |
| parent | dc52e6200df616293c611ad88def7a657cf93c9a (diff) | |
| download | ffmpeg-c465254fbf18c9fa133aa5514dc429c2ae15ed3d.tar.gz | |
avformat/mpegts: Do not ignore registration descriptors when probing is enabled
This is required for the (not yet in git) private stream detection/export,
no other testcase known
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 aeb2335eac..eff68197b8 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1758,7 +1758,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type case 0x05: /* registration descriptor */ st->codec->codec_tag = bytestream_get_le32(pp); av_log(fc, AV_LOG_TRACE, "reg_desc=%.4s\n", (char *)&st->codec->codec_tag); - if (st->codec->codec_id == AV_CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE || st->request_probe > 0) mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); break; case 0x52: /* stream identifier descriptor */ |