[FFmpeg-cvslog] avformat/rtspdec: return proper error code

Limin Wang git at videolan.org
Wed Nov 11 12:41:21 EET 2020


ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Wed Nov  4 21:06:00 2020 +0800| [89429cf2f260340c26d262b0da691e988e572e44] | committer: Limin Wang

avformat/rtspdec: return proper error code

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89429cf2f260340c26d262b0da691e988e572e44
---

 libavformat/rtspdec.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 3abf34b940..a4cd1f68ff 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -768,7 +768,7 @@ redo:
     }
     ret = ffurl_read_complete(rt->rtsp_hd, buf, 3);
     if (ret != 3)
-        return -1;
+        return AVERROR(EIO);
     id  = buf[0];
     len = AV_RB16(buf + 1);
     av_log(s, AV_LOG_TRACE, "id=%d len=%d\n", id, len);
@@ -777,10 +777,10 @@ redo:
     /* get the data */
     ret = ffurl_read_complete(rt->rtsp_hd, buf, len);
     if (ret != len)
-        return -1;
+        return AVERROR(EIO);
     if (rt->transport == RTSP_TRANSPORT_RDT &&
-        ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL) < 0)
-        return -1;
+        (ret = ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL)) < 0)
+        return ret;
 
     /* find the matching stream */
     for (i = 0; i < rt->nb_rtsp_streams; i++) {



More information about the ffmpeg-cvslog mailing list