Combine deprecation guards where appropriate

[ffmpeg] / libavformat / aacdec.c

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index f7e61efe9bcb298025e6bc7f2750eb7dd82c9995..2f207928dbb3a44078d62636f5ebc15d4a7ae4d7 100644 (file)
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -82,8 +82,8 @@ static int adts_aac_read_header(AVFormatContext *s)
     if (!st)
         return AVERROR(ENOMEM);
 
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id   = s->iformat->raw_codec_id;
+    st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id   = s->iformat->raw_codec_id;
     st->need_parsing      = AVSTREAM_PARSE_FULL;
 
     ff_id3v1_read(s);
@@ -102,5 +102,6 @@ AVInputFormat ff_aac_demuxer = {
     .read_packet  = ff_raw_read_partial_packet,
     .flags        = AVFMT_GENERIC_INDEX,
     .extensions   = "aac",
+    .mime_type    = "audio/aac,audio/aacp,audio/x-aac",
     .raw_codec_id = AV_CODEC_ID_AAC,
 };