Skip to content

F
ffmpeg.wasm-core
Commit afaa39b4 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr(). 

Fixes ticket #3660.
parent ce4d91ba
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
libavformat/isom.c
View file @ afaa39b4
...@@ -441,6 +441,7 @@ static const AVCodecTag mp4_audio_types[] = { ...@@ -441,6 +441,7 @@ static const AVCodecTag mp4_audio_types[] = {
int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb) int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb)
{ {
enum AVCodecID codec_id;
int len, tag; int len, tag;
int ret; int ret;
int object_type_id = avio_r8(pb); int object_type_id = avio_r8(pb);
...@@ -454,7 +455,9 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext ...@@ -454,7 +455,9 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
return -1; return -1;
} }
st->codec->codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id); codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id);
if (codec_id)
st->codec->codec_id= codec_id;
av_dlog(fc, "esds object type id 0x%02x\n", object_type_id); av_dlog(fc, "esds object type id 0x%02x\n", object_type_id);
len = ff_mp4_read_descr(fc, pb, &tag); len = ff_mp4_read_descr(fc, pb, &tag);
if (tag == MP4DecSpecificDescrTag) { if (tag == MP4DecSpecificDescrTag) {
......
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