Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / aacdec.c

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 5c5f06cd589bb5d594d9914e90395c0855737e99..156a3509a4a635dbaf9b287812a152fed03a2090 100644 (file)
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -62,8 +62,7 @@ static int adts_aac_probe(AVProbeData *p)
     else                   return 0;
 }
 
-static int adts_aac_read_header(AVFormatContext *s,
-                                AVFormatParameters *ap)
+static int adts_aac_read_header(AVFormatContext *s)
 {
     AVStream *st;
 
@@ -72,7 +71,7 @@ static int adts_aac_read_header(AVFormatContext *s,
         return AVERROR(ENOMEM);
 
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id = s->iformat->value;
+    st->codec->codec_id = s->iformat->raw_codec_id;
     st->need_parsing = AVSTREAM_PARSE_FULL;
 
     ff_id3v1_read(s);
@@ -91,5 +90,5 @@ AVInputFormat ff_aac_demuxer = {
     .read_packet    = ff_raw_read_partial_packet,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "aac",
-    .value = CODEC_ID_AAC,
+    .raw_codec_id   = CODEC_ID_AAC,
 };