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)
* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
  rtmp: Always call rtmp_close() on rtmp_open() failure

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

Simple merge