diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-03-08 13:36:51 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-03-09 09:48:14 -0800 |
| commit | 100c3fb2d1d7451857fd143c98b329e271dbdf50 (patch) | |
| tree | d1faf2d07a5a673aa8013a81f5ce4c7daefc9b57 /libavformat | |
| parent | 744dd1d35611b8dec7727d0f676bb44742ad49a1 (diff) | |
| download | ffmpeg-100c3fb2d1d7451857fd143c98b329e271dbdf50.tar.gz | |
mpegts: Always honor a registration descriptor if present and there is no other codec information.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fb0c416b3b..dd51b85765 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1349,8 +1349,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_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag); - if (st->codec->codec_id == CODEC_ID_NONE && - stream_type == STREAM_TYPE_PRIVATE_DATA) + if (st->codec->codec_id == CODEC_ID_NONE) mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); break; default: |