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)
* commit '3941df546276b190cc9362fd093e6721e8e52f50':
  aea: Return proper error code on invalid header

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

Simple merge