Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 21:27:42 +0000 (22:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 21:27:48 +0000 (22:27 +0100)
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
  hlsproto: Properly close avio buffer in case of error

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

Simple merge