From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 26 Oct 2013 00:46:34 +0000 (+0200)
Subject: Merge commit 'adea4512c6087280702e2423de55cea050e20a98'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c508a0354283867984f8bbb3a013b296de67f6b;p=ffmpeg

Merge commit 'adea4512c6087280702e2423de55cea050e20a98'

* commit 'adea4512c6087280702e2423de55cea050e20a98':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e2190c9b005117eaad57f7559cd82581c
See: 72cf47b241c7972cce313e1f474bdb8f3684fa15

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

8c508a0354283867984f8bbb3a013b296de67f6b