Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:11:03 +0000 (21:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:12:07 +0000 (21:12 +0200)
commit8cad746093dbabc0a46ce6dc05e2443261930162
tree99dfdd0371349875862f2ec1782803912c17a10c
parent9694695a21d08ae470b2db6278f92c5c31d07b41
parent02cf0c9e42967de1e4d2803bee3573bc5b735fdd
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/aacdec.c