generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2

Browse Source 
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a':
  rtmpproto: Make sure to pass on the error code if read_connect failed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-04 20:54:43 +02:00
parent b34fce9c54 c4e764aa69
commit 8c5897632a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtmpproto.c
View File

@@ -2556,7 +2556,7 @@ reconnect:
if ((ret = gen_connect(s, rt)) < 0) if ((ret = gen_connect(s, rt)) < 0)
goto fail; goto fail;
} else { } else {
if (read_connect(s, s->priv_data) < 0) if ((ret = read_connect(s, s->priv_data)) < 0)
goto fail; goto fail;
} }