[FFmpeg-cvslog] avformat/http: Use ff_http_averror()

Andrey Utkin git at videolan.org
Mon Oct 20 04:32:14 CEST 2014


ffmpeg | branch: master | Andrey Utkin <andrey.utkin at corp.bluecherry.net> | Sat Oct 18 00:24:01 2014 +0400| [81ce3f8e8017886c272bc165104092adbabc2366] | committer: Michael Niedermayer

avformat/http: Use ff_http_averror()

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

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

 libavformat/http.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 1958a1b..d12dcaa 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -250,7 +250,7 @@ redo:
 fail:
     if (s->hd)
         ffurl_closep(&s->hd);
-    return AVERROR(EIO);
+    return ff_http_averror(s->http_code, AVERROR(EIO));
 }
 
 int ff_http_do_new_request(URLContext *h, const char *uri)
@@ -371,7 +371,7 @@ static int check_http_code(URLContext *h, int http_code, const char *end)
         (http_code != 407 || s->proxy_auth_state.auth_type != HTTP_AUTH_NONE)) {
         end += strspn(end, SPACE_CHARS);
         av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", http_code, end);
-        return AVERROR(EIO);
+        return ff_http_averror(http_code, AVERROR(EIO));
     }
     return 0;
 }
@@ -1284,7 +1284,7 @@ redo:
 
     if (s->http_code < 400)
         return 0;
-    ret = AVERROR(EIO);
+    ret = ff_http_averror(s->http_code, AVERROR(EIO));
 
 fail:
     http_proxy_close(h);



More information about the ffmpeg-cvslog mailing list