Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)
commit831e749bc926db2aea5f999529e176d18c832c82
tree195b63489c5cbe4880dc00e037b0bb11253edb98
parent1bcfb1eea836e3c357732ece6d96f5c87938b6d6
parent07c52e2c7c60b087fd023cd9771778973def0b33
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: return meaningful errors

Conflicts:
libavcodec/aacdec.c

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