Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:54:43 +0000 (20:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:54:43 +0000 (20:54 +0200)
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a':
  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