Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:42:49 +0000 (12:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:42:59 +0000 (12:42 +0200)
* commit '0528226a05cc08b74197547fba0b1939bf68990d':
  a64: Return correct error code on invalid data stream

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

Simple merge