[FFmpeg-cvslog] Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 00:49:52 2014 +0200| [20ad2152ddc2606b0869e80ebf0b5154f13c7934] | committer: Michael Niedermayer

Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'

* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
  cdg: Forward error from avio_size() in read_header() function

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

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