Merge commit '6258d362b82934a2c27557e0984aed372d98091a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:09:20 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:09:41 +0000 (12:09 +0200)
* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

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

Simple merge