Browse Source

mpegts: Always honor a registration descriptor if present and there is no other codec information.

tags/n0.11
Alex Converse 13 years ago
parent
commit
100c3fb2d1
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavformat/mpegts.c

+ 1
- 2
libavformat/mpegts.c View File

@@ -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:


Loading…
Cancel
Save