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)
commitf0ee0341b069818d466bc03709c48e6cc6bef9c5
tree76207ae17e151420f8e7bbd2bcd62f9d027c7f37
parent946902e5b9c2574969ac239b2dfb4d88e069fa29
parent6258d362b82934a2c27557e0984aed372d98091a
Merge commit '6258d362b82934a2c27557e0984aed372d98091a'

* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

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