Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 13:20:12 +0000 (14:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 13:20:37 +0000 (14:20 +0100)
commit2d0440f93f93d2f92947dabb481b3e56c099ea26
treef1f5405ae9a68ad21b439e7c71fdc224c49c6f6f
parentaee51ee8b9b87b16bd1ecced9d984344f8d4d4ea
parent3941df546276b190cc9362fd093e6721e8e52f50
Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'

* commit '3941df546276b190cc9362fd093e6721e8e52f50':
  aea: Return proper error code on invalid header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/aea.c