summaryrefslogtreecommitdiff
path: root/libavformat/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-29 21:11:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-29 21:12:07 +0200
commit8cad746093dbabc0a46ce6dc05e2443261930162 (patch)
tree99dfdd0371349875862f2ec1782803912c17a10c /libavformat/aacdec.c
parent9694695a21d08ae470b2db6278f92c5c31d07b41 (diff)
parent02cf0c9e42967de1e4d2803bee3573bc5b735fdd (diff)
downloadffmpeg-8cad746093dbabc0a46ce6dc05e2443261930162.tar.gz
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd': aac: Register the mime type Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aacdec.c')
-rw-r--r--libavformat/aacdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 05cbaf78aa..1b98e1ddb5 100644
--- 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,
};