[FFmpeg-cvslog] Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 12:42:49 2014 +0200| [8d403d9c89febcbca094206a866c82426fbcd1c8] | committer: Michael Niedermayer

Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d403d9c89febcbca094206a866c82426fbcd1c8
---