Merge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:14:12 +0000 (17:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:14:17 +0000 (17:14 +0200)
commit238360665b26e7bc599ffb9b18d8463e84feb8e1
tree7b8d43007d98f84b28b951297369d6dd2217180b
parent10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3
parentb77819afbc44016143b4a11b46109625203c4cef
Merge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1

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

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