From: Michael Niedermayer Date: Mon, 4 Nov 2013 10:50:47 +0000 (+0100) Subject: Merge remote-tracking branch 'qatar/master' X-Git-Tag: n2.2-rc1~2219 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=405ceb181236b0c7b4558dbefac8869c93df5965 Merge remote-tracking branch 'qatar/master' * qatar/master: aacdec: Set the profile during decoding Merged-by: Michael Niedermayer --- 405ceb181236b0c7b4558dbefac8869c93df5965