Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd': aac: Register the mime type Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg · Jul 29, 2014 · 8cad746 · 8cad746
2 parents 9694695 + 02cf0c9
commit 8cad746
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
@@ -110,5 +110,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,
 };