avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

[ffmpeg] / libavformat / aacdec.c

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index df94d15831b313cea80ac172246db0e2ce49beb0..6f9763facbc998e47737bdc24264439def7a1ced 100644 (file)
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -70,7 +70,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);
@@ -83,11 +83,11 @@ static int adts_aac_read_header(AVFormatContext *s)
 
 AVInputFormat ff_aac_demuxer = {
     .name           = "aac",
-    .long_name      = NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
+    .long_name      = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"),
     .read_probe     = adts_aac_probe,
     .read_header    = adts_aac_read_header,
     .read_packet    = ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "aac",
-    .value = CODEC_ID_AAC,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "aac",
+    .raw_codec_id   = AV_CODEC_ID_AAC,
 };