[FFmpeg-cvslog] Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 14 14:12:41 2014 +0200| [8e5f84047268566a1420db4f10975ad93290515e] | committer: Michael Niedermayer

Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1'

* commit '6477139721f559b26eafd415e23e13ea2b0c27e1':
  rtmpproto: Make sure to pass on the error code if read_connect failed

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

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