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

Merge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1

Browse Source 
* commit 'b77819afbc44016143b4a11b46109625203c4cef':
  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-04-21 17:14:12 +02:00
parent 10b8ae5b10 b77819afbc
commit 238360665b
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

@@ -2444,7 +2444,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;
rt->is_input = 1; rt->is_input = 1;
} }