[FFmpeg-cvslog] avformat/http: pass return code from http_open_cnx_internal() on its failure

Andrey Utkin git at videolan.org
Thu Oct 23 20:58:51 CEST 2014


ffmpeg | branch: master | Andrey Utkin <andrey.utkin at corp.bluecherry.net> | Thu Oct 23 20:55:46 2014 +0400| [70c9d400087c182ce670fcc008b05c2edabd73e9] | committer: Michael Niedermayer

avformat/http: pass return code from http_open_cnx_internal() on its failure

Previously, AVERROR(EIO) was returned on failure of
http_open_cnx_internal(). Now the value is passed to upper level, thus
it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/http.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/http.c b/libavformat/http.c
index d12dcaa..dfc01ee 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -250,6 +250,8 @@ redo:
 fail:
     if (s->hd)
         ffurl_closep(&s->hd);
+    if (location_changed < 0)
+        return location_changed;
     return ff_http_averror(s->http_code, AVERROR(EIO));
 }
 



More information about the ffmpeg-cvslog mailing list