diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 14:12:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 14:12:47 +0200 |
| commit | 8e5f84047268566a1420db4f10975ad93290515e (patch) | |
| tree | 6e86cb2e1cb454c03ff251645bd24c71361cc914 /libavformat | |
| parent | 5e379cd3ee87f00db3fdc25e559f9ff1b7ef8efe (diff) | |
| parent | 6477139721f559b26eafd415e23e13ea2b0c27e1 (diff) | |
| download | ffmpeg-8e5f84047268566a1420db4f10975ad93290515e.tar.gz | |
Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1'
* commit '6477139721f559b26eafd415e23e13ea2b0c27e1':
rtmpproto: Make sure to pass on the error code if read_connect failed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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; } |