diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:54:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:54:43 +0200 |
| commit | 8c5897632a326c1d797f0bd45f97e0c83683412c (patch) | |
| tree | 63f8e8d35db21e30670d63bf946494ca99b1c1a3 | |
| parent | b34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a (diff) | |
| parent | c4e764aa6980dd9dc7c423921b415ff7261c944a (diff) | |
| download | ffmpeg-8c5897632a326c1d797f0bd45f97e0c83683412c.tar.gz | |
Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a':
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 9a80c2f949..0b39b98124 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2556,7 +2556,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; } |