Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 11:29:23 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 11:29:29 +0000 (13:29 +0200)
* qatar/release/9:
  ac3: Return proper error codes
  ac3: Clean up the error paths
  ac3: Do not clash with normal AVERROR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aac_ac3_parser.h
libavcodec/ac3dec.c

Simple merge
Simple merge