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)
commit8d403d9c89febcbca094206a866c82426fbcd1c8
tree67e2009cc7b4e6690da257f8a173bbdea1543185
parentde7b08cbc1c11482405504e76f402e5c32b60f22
parent0528226a05cc08b74197547fba0b1939bf68990d
Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'

* commit '0528226a05cc08b74197547fba0b1939bf68990d':
  a64: Return correct error code on invalid data stream

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