nut prefers extradata style global headers

[ffmpeg] / libavformat / avio.c

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 18d19bf2f56da9bec1176f501aff700c5e375310..f4cee60668bd5a37c520749ddd322d67247b81db 100644 (file)
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -95,22 +95,24 @@ int url_read(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
     if (h->flags & URL_WRONLY)
-        return -EIO;
+        return AVERROR_IO;
     ret = h->prot->url_read(h, buf, size);
     return ret;
 }
 
+#ifdef CONFIG_ENCODERS
 int url_write(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
     if (!(h->flags & (URL_WRONLY | URL_RDWR)))
-        return -EIO;
+        return AVERROR_IO;
     /* avoid sending too big packets */
     if (h->max_packet_size && size > h->max_packet_size)
-        return -EIO; 
+        return AVERROR_IO; 
     ret = h->prot->url_write(h, buf, size);
     return ret;
 }
+#endif //CONFIG_ENCODERS
 
 offset_t url_seek(URLContext *h, offset_t pos, int whence)
 {
@@ -145,7 +147,7 @@ offset_t url_filesize(URLContext *h)
     offset_t pos, size;
     
     pos = url_seek(h, 0, SEEK_CUR);
-    size = url_seek(h, 0, SEEK_END);
+    size = url_seek(h, -1, SEEK_END)+1;
     url_seek(h, pos, SEEK_SET);
     return size;
 }