1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-29 21:11:03 +02:00
commit 8cad746093

View File

@ -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,
};