From: Michael Niedermayer Date: Wed, 23 Oct 2013 07:53:52 +0000 (+0200) Subject: Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7' X-Git-Tag: n2.1~142 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=e0f291822306b544366faf408df4661c7acc300e Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7' * commit 'f457edb69794c7e13b3630456d72f7942fff19f7': aacdec: Use avpriv_report_missing_feature() instead of custom logging. Merged-by: Michael Niedermayer --- e0f291822306b544366faf408df4661c7acc300e