diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:14:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:14:17 +0200 |
| commit | 238360665b26e7bc599ffb9b18d8463e84feb8e1 (patch) | |
| tree | 7b8d43007d98f84b28b951297369d6dd2217180b | |
| parent | 10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3 (diff) | |
| parent | b77819afbc44016143b4a11b46109625203c4cef (diff) | |
| download | ffmpeg-238360665b26e7bc599ffb9b18d8463e84feb8e1.tar.gz | |
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>
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 26e3e96382..d5ad463165 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -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; } |