[FFmpeg-cvslog] Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 23:48:02 2014 +0200| [52bf4ad6746a38f3e37b9ca8d579be7c448159cc] | committer: Michael Niedermayer

Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'

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

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

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