Browse Source

Make sure the http protocol handler returns errors if a delayed open had failed

Originally committed as revision 23548 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Martin Storsjö 15 years ago
parent
commit
130b096aea
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      libavformat/http.c

+ 6
- 0
libavformat/http.c View File

@@ -371,6 +371,8 @@ static int http_read(URLContext *h, uint8_t *buf, int size)
if (ret != 0)
return ret;
}
if (!s->hd)
return AVERROR(EIO);

/* A size of zero can be used to force
* initializaton of the connection. */
@@ -429,6 +431,8 @@ static int http_write(URLContext *h, const uint8_t *buf, int size)
if (ret != 0)
return ret;
}
if (!s->hd)
return AVERROR(EIO);

if (s->chunksize == -1) {
/* headers are sent without any special encoding */
@@ -485,6 +489,8 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
if (ret != 0)
return ret;
}
if (!s->hd)
return AVERROR(EIO);

if (whence == AVSEEK_SIZE)
return s->filesize;


Loading…
Cancel
Save