diff options
| author | Martin Storsjö <martin@martin.st> | 2014-04-13 13:44:03 +0300 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-04-19 22:03:57 -0400 |
| commit | c4e764aa6980dd9dc7c423921b415ff7261c944a (patch) | |
| tree | 6f802ab3b96519eb98b926ab8d56956968b6500d | |
| parent | 9d02e38d3f03100784348ff75fd181d2aaad7e43 (diff) | |
| download | ffmpeg-c4e764aa6980dd9dc7c423921b415ff7261c944a.tar.gz | |
rtmpproto: Make sure to pass on the error code if read_connect failed
Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -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 51381a4d0c..bc6a4fef69 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2555,7 +2555,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; } |