Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 12:12:41 +0000 (14:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 12:12:47 +0000 (14:12 +0200)
* commit '6477139721f559b26eafd415e23e13ea2b0c27e1':
  rtmpproto: Make sure to pass on the error code if read_connect failed

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

Simple merge