MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/rtsp: fix the error code from ffurl_read_complete()

Browse Source 
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2021-12-07 20:46:34 +08:00
parent 6d42af02f5
commit f1c8c25832
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtsp.c
View File

@ -1197,7 +1197,7 @@ start:
ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1); ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1);
av_log(s, AV_LOG_TRACE, "ret=%d c=%02x [%c]\n", ret, ch, ch); av_log(s, AV_LOG_TRACE, "ret=%d c=%02x [%c]\n", ret, ch, ch);
if (ret != 1) if (ret != 1)
return AVERROR_EOF; return ret < 0 ? ret : AVERROR(EIO);
if (ch == '\n') if (ch == '\n')
break; break;
if (ch == '$' && q == buf) { if (ch == '$' && q == buf) {
@ -1250,9 +1250,9 @@ start:
content = av_malloc(content_length + 1); content = av_malloc(content_length + 1);
if (!content) if (!content)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) { if ((ret = ffurl_read_complete(rt->rtsp_hd, content, content_length)) != content_length) {
av_freep(&content); av_freep(&content);
return AVERROR(EIO); return ret < 0 ? ret : AVERROR(EIO);
} }
content[content_length] = '\0'; content[content_length] = '\0';
} }