mirror of https://git.ffmpeg.org/ffmpeg.git
mpegts: Always honor a registration descriptor if present and there is no other codec information.
This commit is contained in:
parent
744dd1d356
commit
100c3fb2d1
|
@ -1349,8 +1349,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
|
||||||
case 0x05: /* registration descriptor */
|
case 0x05: /* registration descriptor */
|
||||||
st->codec->codec_tag = bytestream_get_le32(pp);
|
st->codec->codec_tag = bytestream_get_le32(pp);
|
||||||
av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
|
av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
|
||||||
if (st->codec->codec_id == CODEC_ID_NONE &&
|
if (st->codec->codec_id == CODEC_ID_NONE)
|
||||||
stream_type == STREAM_TYPE_PRIVATE_DATA)
|
|
||||||
mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
|
mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue