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)
commit8c5897632a326c1d797f0bd45f97e0c83683412c
tree63f8e8d35db21e30670d63bf946494ca99b1c1a3
parentb34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a
parentc4e764aa6980dd9dc7c423921b415ff7261c944a
Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2

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

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