Module: libav Branch: master Commit: 100c3fb2d1d7451857fd143c98b329e271dbdf50
Author: Alex Converse <[email protected]> Committer: Alex Converse <[email protected]> Date: Thu Mar 8 13:36:51 2012 -0800 mpegts: Always honor a registration descriptor if present and there is no other codec information. --- libavformat/mpegts.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fb0c416..dd51b85 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: _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
