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)
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

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

Simple merge