[FFmpeg-cvslog] Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 23 22:27:42 2015 +0100| [0c00e734ef2b1cac83cf71f331bdb0f6e504de23] | committer: Michael Niedermayer

Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'

* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
  hlsproto: Properly close avio buffer in case of error

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

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