Browse Source

avformat/mpegts: Do not trust BSSD descriptor, it is sometimes not an S302M stream

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5eb70ad95)

Conflicts:

	libavformat/mpegts.c
tags/n2.8.8
Michael Niedermayer 9 years ago
parent
commit
a4484854db
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavformat/mpegts.c

+ 4
- 1
libavformat/mpegts.c View File

@@ -1774,8 +1774,11 @@ 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 || st->request_probe > 0)
if (st->codec->codec_id == AV_CODEC_ID_NONE || st->request_probe > 0) {
mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
if (st->codec->codec_tag == MKTAG('B', 'S', 'S', 'D'))
st->request_probe = 50;
}
break;
case 0x52: /* stream identifier descriptor */
st->stream_identifier = 1 + get8(pp, desc_end);


Loading…
Cancel
Save