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>
This commit is contained in:
Michael Niedermayer
2014-04-21 17:14:12 +02:00

View File

@@ -2444,7 +2444,7 @@ reconnect:
if ((ret = gen_connect(s, rt)) < 0)
goto fail;
} else {
if (read_connect(s, s->priv_data) < 0)
if ((ret = read_connect(s, s->priv_data)) < 0)
goto fail;
rt->is_input = 1;
}