Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd': aac: Register the mime type Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8cad746093
parent 9694695a21 02cf0c9e42
commit 8cad746093
1 changed files with 1 additions and 0 deletions
--- 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,
 };