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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 28 10:08:43 2013 +0200| [831e749bc926db2aea5f999529e176d18c832c82] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: return meaningful errors

Conflicts:
	libavcodec/aacdec.c

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

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