[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 11:50:47 2013 +0100| [405ceb181236b0c7b4558dbefac8869c93df5965] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=405ceb181236b0c7b4558dbefac8869c93df5965
---