[SCM] libav/experimental: rtmpproto: Make sure to pass on the error code if read_connect failed
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:49 UTC 2014
The following commit has been merged in the experimental branch:
commit 6477139721f559b26eafd415e23e13ea2b0c27e1
Author: Martin Storsjö <martin at martin.st>
Date: Sun Apr 13 13:44:03 2014 +0300
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 at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 51381a4..bc6a4fe 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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list