generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Return meaningful error codes

Browse Source
This commit is contained in:
Luca Barbato 2014-03-10 17:17:25 +01:00
parent 390acbea06
commit 55a215ba63
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/http.c
View File

@ -264,7 +264,7 @@ static int http_getc(HTTPContext *s)
if (len < 0) { if (len < 0) {
return len; return len;
} else if (len == 0) { } else if (len == 0) {
return -1; return AVERROR_EOF;
} else { } else {
s->buf_ptr = s->buffer; s->buf_ptr = s->buffer;
s->buf_end = s->buffer + len; s->buf_end = s->buffer + len;
@ -327,7 +327,7 @@ static int process_line(URLContext *h, char *line, int line_count,
end += strspn(end, SPACE_CHARS); end += strspn(end, SPACE_CHARS);
av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n",
s->http_code, end); s->http_code, end);
return -1; return AVERROR(EIO);
} }
} else { } else {
while (*p != '\0' && *p != ':') while (*p != '\0' && *p != ':')
@ -732,13 +732,13 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
URLContext *old_hd = s->hd; URLContext *old_hd = s->hd;
int64_t old_off = s->off; int64_t old_off = s->off;
uint8_t old_buf[BUFFER_SIZE]; uint8_t old_buf[BUFFER_SIZE];
int old_buf_size; int old_buf_size, ret;
AVDictionary *options = NULL; AVDictionary *options = NULL;
if (whence == AVSEEK_SIZE) if (whence == AVSEEK_SIZE)
return s->filesize; return s->filesize;
else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed) 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 */ /* we save the old context in case the seek fails */
old_buf_size = s->buf_end - s->buf_ptr; old_buf_size = s->buf_end - s->buf_ptr;
@ -752,14 +752,14 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
/* if it fails, continue on old connection */ /* if it fails, continue on old connection */
av_dict_copy(&options, s->chained_options, 0); 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); av_dict_free(&options);
memcpy(s->buffer, old_buf, old_buf_size); memcpy(s->buffer, old_buf, old_buf_size);
s->buf_ptr = s->buffer; s->buf_ptr = s->buffer;
s->buf_end = s->buffer + old_buf_size; s->buf_end = s->buffer + old_buf_size;
s->hd = old_hd; s->hd = old_hd;
s->off = old_off; s->off = old_off;
return -1; return ret;
} }
av_dict_free(&options); av_dict_free(&options);
ffurl_close(old_hd); ffurl_close(old_hd);