diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 02:59:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 02:59:41 +0100 |
commit | 7430f3064fef57ee12bfd8478c239c923096f224 (patch) | |
tree | c63e66127b6ec0ee0cb223653cebcab6eca852af /libavformat | |
parent | eac281b06c453c0af0ffc2a8fb72f976abe583cb (diff) | |
parent | 00ecce5c8bc00ce6f3f4bb19b681c5e14e259501 (diff) | |
download | ffmpeg-7430f3064fef57ee12bfd8478c239c923096f224.tar.gz |
Merge commit '00ecce5' into release/2.2
* commit '00ecce5':
http: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/http.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 69c4d6d7a0..06b2fd6a16 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -287,7 +287,7 @@ static int http_getc(HTTPContext *s) if (len < 0) { return len; } else if (len == 0) { - return -1; + return AVERROR_EOF; } else { s->buf_ptr = s->buffer; s->buf_end = s->buffer + len; @@ -350,7 +350,7 @@ static int process_line(URLContext *h, char *line, int line_count, end += strspn(end, SPACE_CHARS); av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", s->http_code, end); - return -1; + return AVERROR(EIO); } } else { while (*p != '\0' && *p != ':') @@ -945,7 +945,7 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence) URLContext *old_hd = s->hd; int64_t old_off = s->off; uint8_t old_buf[BUFFER_SIZE]; - int old_buf_size; + int old_buf_size, ret; AVDictionary *options = NULL; if (whence == AVSEEK_SIZE) @@ -953,7 +953,7 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence) else if ((whence == SEEK_CUR && off == 0) || (whence == SEEK_SET && off == s->off)) return s->off; else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed) - return -1; + return AVERROR(ENOSYS); /* we save the old context in case the seek fails */ old_buf_size = s->buf_end - s->buf_ptr; @@ -967,14 +967,14 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence) /* if it fails, continue on old connection */ av_dict_copy(&options, s->chained_options, 0); - if (http_open_cnx(h, &options) < 0) { + if ((ret = http_open_cnx(h, &options)) < 0) { av_dict_free(&options); memcpy(s->buffer, old_buf, old_buf_size); s->buf_ptr = s->buffer; s->buf_end = s->buffer + old_buf_size; s->hd = old_hd; s->off = old_off; - return -1; + return ret; } av_dict_free(&options); ffurl_close(old_hd); |