Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:50:47 +0000 (11:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:51:13 +0000 (11:51 +0100)
commit405ceb181236b0c7b4558dbefac8869c93df5965
treeb68e99e62e1f4541969706b56e281aa94f15e1b4
parentab71be091206a2264f3a8862215fc284bb8e6274
parent454959a5aa73b585e2937b948178310c74bfc297
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Set the profile during decoding

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