Skip to content

F
ffmpeg.wasm-core
Commit 100c3fb2 authored by Alex Converse's avatar Alex Converse
Browse files
Options

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

parent 744dd1d3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
libavformat/mpegts.c
View file @ 100c3fb2
...@@ -1349,8 +1349,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment