Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / loasdec.c

diff --git a/libavformat/loasdec.c b/libavformat/loasdec.c
index e48c21905a5714a4f447a4254c2a5eb5deedc5e3..4b4e04fff98012f981272b9b3402ab05ca734d97 100644 (file)
--- a/libavformat/loasdec.c
+++ b/libavformat/loasdec.c
@@ -59,8 +59,7 @@ static int loas_probe(AVProbeData *p)
     else                   return 0;
 }
 
-static int loas_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int loas_read_header(AVFormatContext *s)
 {
     AVStream *st;
 
@@ -69,7 +68,7 @@ static int loas_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;
 
     //LCM of all possible AAC sample rates
@@ -85,5 +84,5 @@ AVInputFormat ff_loas_demuxer = {
     .read_header    = loas_read_header,
     .read_packet    = ff_raw_read_partial_packet,
     .flags= AVFMT_GENERIC_INDEX,
-    .value = CODEC_ID_AAC_LATM,
+    .raw_codec_id = CODEC_ID_AAC_LATM,
 };