Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:53:52 +0000 (09:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:53:57 +0000 (09:53 +0200)
commite0f291822306b544366faf408df4661c7acc300e
treee3ff79b439ba5fe05a94a77f64defb26ca922eba
parent078abccdd6dc3f173e3b420fa66e9b8859827b03
parentf457edb69794c7e13b3630456d72f7942fff19f7
Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'

* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

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