[FFmpeg-cvslog] Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 00:43:47 2015 +0200| [ebab902a1c3670c1e445d144f1d4365f32955a85] | committer: Michael Niedermayer

Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'

* commit 'bff0349d9da527084e1433167466d8afc9e25c7f':
  avio: Add avio_read wrapper to simplify error checking

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

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