Browse Source

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

Fixes ticket #3660.
tags/n2.3
Carl Eugen Hoyos 11 years ago
parent
commit
afaa39b46d
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavformat/isom.c

+ 4
- 1
libavformat/isom.c View File

@@ -441,6 +441,7 @@ static const AVCodecTag mp4_audio_types[] = {

int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb)
{
enum AVCodecID codec_id;
int len, tag;
int ret;
int object_type_id = avio_r8(pb);
@@ -454,7 +455,9 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
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);
len = ff_mp4_read_descr(fc, pb, &tag);
if (tag == MP4DecSpecificDescrTag) {


Loading…
Cancel
Save