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)
commit0c00e734ef2b1cac83cf71f331bdb0f6e504de23
tree6a7ff511ba2de020b91c618624313a55387ff7f9
parentda304c529b65058c0a001b3bbb18e83539a28d71
parent7915e6741dbe1cf3a8781cead3e68a7666de14f4
Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'

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

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