Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 21:48:02 +0000 (23:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 21:48:21 +0000 (23:48 +0200)
commit52bf4ad6746a38f3e37b9ca8d579be7c448159cc
tree73c2bc4910d5b57556f66dc21491a9ce31257ee5
parentfa040c224703a51d8a07ec33354ab47d275c0493
parent0034314a69e76a53534a74cceef865cfcb7b42cc
Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'

* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
  rtmp: Always call rtmp_close() on rtmp_open() failure

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