# HG changeset patch
# User nenolod
# Date 1173733920 25200
# Node ID a195f1259a6b56804ce56cd70063f980df627849
# Parent  a35b692388f6bb5ccea5be404261b7aa9b55ab17
[svn] - merge VFS support from wma plugin.

diff -r a35b692388f6 -r a195f1259a6b ChangeLog
--- a/ChangeLog	Mon Mar 12 14:04:53 2007 -0700
+++ b/ChangeLog	Mon Mar 12 14:12:00 2007 -0700
@@ -1,3 +1,11 @@
+2007-03-12 21:04:53 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1744]
+  - i don't want to hear about deprecation, thanks.
+  
+  trunk/src/ffmpeg/libavformat/avformat.h |   22 +++++++++++-----------
+  1 file changed, 11 insertions(+), 11 deletions(-)
+
+
 2007-03-12 21:03:42 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1742]
   - make a dumb makefile for libavcodec so that it can be a make clean target.
diff -r a35b692388f6 -r a195f1259a6b src/ffmpeg/libavformat/avformat.h
--- a/src/ffmpeg/libavformat/avformat.h	Mon Mar 12 14:04:53 2007 -0700
+++ b/src/ffmpeg/libavformat/avformat.h	Mon Mar 12 14:12:00 2007 -0700
@@ -21,6 +21,9 @@
 #ifndef AVFORMAT_H
 #define AVFORMAT_H
 
+#include <audacious/util.h>
+#include <audacious/vfs.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -449,6 +452,10 @@
                        AVInputFormat *fmt,
                        int buf_size,
                        AVFormatParameters *ap);
+int av_open_input_vfsfile(AVFormatContext **ic_ptr, const char *fn, VFSFile *fd,
+                       AVInputFormat *fmt,
+                       int buf_size,
+                       AVFormatParameters *ap);
 /* no av_open for output, so applications will need this: */
 AVFormatContext *av_alloc_format_context(void);
 
diff -r a35b692388f6 -r a195f1259a6b src/ffmpeg/libavformat/avio.c
--- a/src/ffmpeg/libavformat/avio.c	Mon Mar 12 14:04:53 2007 -0700
+++ b/src/ffmpeg/libavformat/avio.c	Mon Mar 12 14:12:00 2007 -0700
@@ -2,21 +2,19 @@
  * Unbuffered io for ffmpeg system
  * Copyright (c) 2001 Fabrice Bellard
  *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "avformat.h"
 
@@ -35,6 +33,38 @@
     return 0;
 }
 
+int url_vopen(URLContext **puc, VFSFile *fd)
+{
+    URLContext *uc;
+    URLProtocol *up;
+    const char *p;
+    char proto_str[128], *q;
+    int err = 0;
+
+    up = first_protocol;
+    uc = av_malloc(sizeof(URLContext) + strlen(fd->uri ? fd->uri : ""));
+    if (!uc) {
+        err = -ENOMEM;
+        goto fail;
+    }
+    strcpy(uc->filename, fd->uri ? fd->uri : "");
+    uc->prot = up;
+    uc->flags = URL_RDONLY;
+    uc->is_streamed = 0; /* default = not streamed */
+    uc->max_packet_size = 0; /* default: stream file */
+    uc->priv_data = fd;
+    if (err < 0) {
+        free(uc);
+        *puc = NULL;
+        return err;
+    }
+    *puc = uc;
+    return 0;
+ fail:
+    *puc = NULL;
+    return err;
+}
+
 int url_open(URLContext **puc, const char *filename, int flags)
 {
     URLContext *uc;
@@ -43,33 +73,7 @@
     char proto_str[128], *q;
     int err;
 
-    p = filename;
-    q = proto_str;
-    while (*p != '\0' && *p != ':') {
-        /* protocols can only contain alphabetic chars */
-        if (!isalpha(*p))
-            goto file_proto;
-        if ((q - proto_str) < sizeof(proto_str) - 1)
-            *q++ = *p;
-        p++;
-    }
-    /* if the protocol has length 1, we consider it is a dos drive */
-    if (*p == '\0' || (q - proto_str) <= 1) {
-    file_proto:
-        strcpy(proto_str, "file");
-    } else {
-        *q = '\0';
-    }
-
     up = first_protocol;
-    while (up != NULL) {
-        if (!strcmp(proto_str, up->name))
-            goto found;
-        up = up->next;
-    }
-    err = -ENOENT;
-    goto fail;
- found:
     uc = av_malloc(sizeof(URLContext) + strlen(filename));
     if (!uc) {
         err = -ENOMEM;
@@ -82,7 +86,7 @@
     uc->max_packet_size = 0; /* default: stream file */
     err = up->url_open(uc, filename, flags);
     if (err < 0) {
-        av_free(uc);
+        free(uc);
         *puc = NULL;
         return err;
     }
@@ -97,25 +101,11 @@
 {
     int ret;
     if (h->flags & URL_WRONLY)
-        return AVERROR_IO;
+        return -EIO;
     ret = h->prot->url_read(h, buf, size);
     return ret;
 }
 
-#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
-int url_write(URLContext *h, unsigned char *buf, int size)
-{
-    int ret;
-    if (!(h->flags & (URL_WRONLY | URL_RDWR)))
-        return AVERROR_IO;
-    /* avoid sending too big packets */
-    if (h->max_packet_size && size > h->max_packet_size)
-        return AVERROR_IO;
-    ret = h->prot->url_write(h, buf, size);
-    return ret;
-}
-#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
-
 offset_t url_seek(URLContext *h, offset_t pos, int whence)
 {
     offset_t ret;
@@ -128,11 +118,12 @@
 
 int url_close(URLContext *h)
 {
-    int ret;
+	int ret;
 
-    ret = h->prot->url_close(h);
-    av_free(h);
-    return ret;
+    	ret = h->prot->url_close(h);
+    	free(h);
+    
+	return ret;
 }
 
 int url_exist(const char *filename)
@@ -147,18 +138,18 @@
 offset_t url_filesize(URLContext *h)
 {
     offset_t pos, size;
-
+    
     pos = url_seek(h, 0, SEEK_CUR);
-    size = url_seek(h, -1, SEEK_END)+1;
+    size = url_seek(h, 0, SEEK_END);
     url_seek(h, pos, SEEK_SET);
     return size;
 }
 
-/*
+/* 
  * Return the maximum packet size associated to packetized file
  * handle. If the file is not packetized (stream like http or file on
  * disk), then 0 is returned.
- *
+ * 
  * @param h file handle
  * @return maximum packet size in bytes
  */
@@ -178,11 +169,11 @@
     return 0;
 }
 
-/**
+/** 
  * The callback is called in blocking functions to test regulary if
  * asynchronous interruption is needed. -EINTR is returned in this
  * case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
+ * callback is given.  
  */
 void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
 {
diff -r a35b692388f6 -r a195f1259a6b src/ffmpeg/libavformat/avio.h
--- a/src/ffmpeg/libavformat/avio.h	Mon Mar 12 14:04:53 2007 -0700
+++ b/src/ffmpeg/libavformat/avio.h	Mon Mar 12 14:12:00 2007 -0700
@@ -1,26 +1,8 @@
-/*
- * unbuffered io for ffmpeg system
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
 #ifndef AVIO_H
 #define AVIO_H
 
+#include <audacious/vfs.h>
+
 /* output byte stream handling */
 
 typedef int64_t offset_t;
@@ -29,7 +11,7 @@
 
 struct URLContext {
     struct URLProtocol *prot;
-    int flags;
+    int flags;        
     int is_streamed;  /* true if streamed (no seek possible), default = false */
     int max_packet_size;  /* if non zero, the stream is packetized with this max packet size */
     void *priv_data;
@@ -50,6 +32,7 @@
 
 typedef int URLInterruptCB(void);
 
+int url_vopen(URLContext **h, VFSFile *fd);
 int url_open(URLContext **h, const char *filename, int flags);
 int url_read(URLContext *h, unsigned char *buf, int size);
 int url_write(URLContext *h, unsigned char *buf, int size);
@@ -90,18 +73,14 @@
     unsigned char *buf_ptr, *buf_end;
     void *opaque;
     int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    offset_t (*seek)(void *opaque, offset_t offset, int whence);
+    void (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int (*seek)(void *opaque, offset_t offset, int whence);
     offset_t pos; /* position in the file of the current buffer */
     int must_flush; /* true if the next seek should flush */
     int eof_reached; /* true if eof reached */
     int write_flag;  /* true if open for writing */
     int is_streamed;
     int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;         ///< contains the error code or 0 if no error happened
 } ByteIOContext;
 
 int init_put_byte(ByteIOContext *s,
@@ -110,8 +89,8 @@
                   int write_flag,
                   void *opaque,
                   int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  offset_t (*seek)(void *opaque, offset_t offset, int whence));
+                  void (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*seek)(void *opaque, offset_t offset, int whence));
 
 void put_byte(ByteIOContext *s, int b);
 void put_buffer(ByteIOContext *s, const unsigned char *buf, int size);
@@ -119,20 +98,17 @@
 void put_be64(ByteIOContext *s, uint64_t val);
 void put_le32(ByteIOContext *s, unsigned int val);
 void put_be32(ByteIOContext *s, unsigned int val);
-void put_le24(ByteIOContext *s, unsigned int val);
-void put_be24(ByteIOContext *s, unsigned int val);
 void put_le16(ByteIOContext *s, unsigned int val);
 void put_be16(ByteIOContext *s, unsigned int val);
 void put_tag(ByteIOContext *s, const char *tag);
 
+void put_be64_double(ByteIOContext *s, double val);
 void put_strz(ByteIOContext *s, const char *buf);
 
 offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence);
 void url_fskip(ByteIOContext *s, offset_t offset);
 offset_t url_ftell(ByteIOContext *s);
-offset_t url_fsize(ByteIOContext *s);
 int url_feof(ByteIOContext *s);
-int url_ferror(ByteIOContext *s);
 
 #define URL_EOF (-1)
 int url_fgetc(ByteIOContext *s);
@@ -146,16 +122,14 @@
 void put_flush_packet(ByteIOContext *s);
 
 int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
-int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
 int get_byte(ByteIOContext *s);
-unsigned int get_le24(ByteIOContext *s);
 unsigned int get_le32(ByteIOContext *s);
 uint64_t get_le64(ByteIOContext *s);
 unsigned int get_le16(ByteIOContext *s);
 
+double get_be64_double(ByteIOContext *s);
 char *get_strz(ByteIOContext *s, char *buf, int maxlen);
 unsigned int get_be16(ByteIOContext *s);
-unsigned int get_be24(ByteIOContext *s);
 unsigned int get_be32(ByteIOContext *s);
 uint64_t get_be64(ByteIOContext *s);
 
@@ -164,6 +138,7 @@
     return s->is_streamed;
 }
 
+int url_vfdopen(ByteIOContext *s, VFSFile *f);
 int url_fdopen(ByteIOContext *s, URLContext *h);
 int url_setbufsize(ByteIOContext *s, int buf_size);
 int url_fopen(ByteIOContext *s, const char *filename, int flags);
@@ -178,9 +153,6 @@
 int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size);
 int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
 
-unsigned long get_checksum(ByteIOContext *s);
-void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum);
-
 /* file.c */
 extern URLProtocol file_protocol;
 extern URLProtocol pipe_protocol;
@@ -197,5 +169,7 @@
 /* http.c */
 extern URLProtocol http_protocol;
 
+extern URLProtocol mms_protocol;
+
 #endif
 
diff -r a35b692388f6 -r a195f1259a6b src/ffmpeg/libavformat/aviobuf.c
--- a/src/ffmpeg/libavformat/aviobuf.c	Mon Mar 12 14:04:53 2007 -0700
+++ b/src/ffmpeg/libavformat/aviobuf.c	Mon Mar 12 14:12:00 2007 -0700
@@ -2,21 +2,19 @@
  * Buffered I/O for ffmpeg system
  * Copyright (c) 2000,2001 Fabrice Bellard
  *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "avformat.h"
 #include "avio.h"
@@ -24,22 +22,20 @@
 
 #define IO_BUFFER_SIZE 32768
 
-static void fill_buffer(ByteIOContext *s);
-
 int init_put_byte(ByteIOContext *s,
                   unsigned char *buffer,
                   int buffer_size,
                   int write_flag,
                   void *opaque,
                   int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  offset_t (*seek)(void *opaque, offset_t offset, int whence))
+                  void (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*seek)(void *opaque, offset_t offset, int whence))
 {
     s->buffer = buffer;
     s->buffer_size = buffer_size;
     s->buf_ptr = buffer;
     s->write_flag = write_flag;
-    if (!s->write_flag)
+    if (!s->write_flag) 
         s->buf_end = buffer;
     else
         s->buf_end = buffer + buffer_size;
@@ -50,107 +46,39 @@
     s->pos = 0;
     s->must_flush = 0;
     s->eof_reached = 0;
-    s->error = 0;
     s->is_streamed = 0;
     s->max_packet_size = 0;
-    s->update_checksum= NULL;
-    if(!read_packet && !write_flag){
-        s->pos = buffer_size;
-        s->buf_end = s->buffer + buffer_size;
-    }
     return 0;
 }
-
-static void flush_buffer(ByteIOContext *s)
-{
-    if (s->buf_ptr > s->buffer) {
-        if (s->write_packet && !s->error){
-            int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
-            if(ret < 0){
-                s->error = ret;
-            }
-        }
-        if(s->update_checksum){
-            s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
-            s->checksum_ptr= s->buffer;
-        }
-        s->pos += s->buf_ptr - s->buffer;
-    }
-    s->buf_ptr = s->buffer;
-}
-
-void put_byte(ByteIOContext *s, int b)
-{
-    *(s->buf_ptr)++ = b;
-    if (s->buf_ptr >= s->buf_end)
-        flush_buffer(s);
-}
-
-void put_buffer(ByteIOContext *s, const unsigned char *buf, int size)
-{
-    int len;
-
-    while (size > 0) {
-        len = (s->buf_end - s->buf_ptr);
-        if (len > size)
-            len = size;
-        memcpy(s->buf_ptr, buf, len);
-        s->buf_ptr += len;
-
-        if (s->buf_ptr >= s->buf_end)
-            flush_buffer(s);
-
-        buf += len;
-        size -= len;
-    }
-}
-
-void put_flush_packet(ByteIOContext *s)
-{
-    flush_buffer(s);
-    s->must_flush = 0;
-}
-
+                  
 offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
 {
     offset_t offset1;
-    offset_t pos= s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer));
 
     if (whence != SEEK_CUR && whence != SEEK_SET)
         return -EINVAL;
-
-    if (whence == SEEK_CUR) {
-        offset1 = pos + (s->buf_ptr - s->buffer);
-        if (offset == 0)
-            return offset1;
-        offset += offset1;
+   
+    {
+        if (whence == SEEK_CUR) {
+            offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
+            if (offset == 0)
+                return offset1;
+            offset += offset1;
+        }
+        offset1 = offset - (s->pos - (s->buf_end - s->buffer));
+        if (offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
+            /* can do the seek inside the buffer */
+            s->buf_ptr = s->buffer + offset1;
+        } else {
+            if (!s->seek)
+                return -EPIPE;
+            s->buf_ptr = s->buffer;
+            s->buf_end = s->buffer;
+            s->seek(s->opaque, offset, SEEK_SET);
+            s->pos = offset;
+        }
+        s->eof_reached = 0;
     }
-    offset1 = offset - pos;
-    if (!s->must_flush &&
-        offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) {
-        /* can do the seek inside the buffer */
-        s->buf_ptr = s->buffer + offset1;
-    } else if(s->is_streamed && !s->write_flag &&
-              offset1 >= 0 && offset1 < (s->buf_end - s->buffer) + (1<<16)){
-        while(s->pos < offset && !s->eof_reached)
-            fill_buffer(s);
-        s->buf_ptr = s->buf_end + offset - s->pos;
-    } else {
-#ifdef CONFIG_MUXERS
-        if (s->write_flag) {
-            flush_buffer(s);
-            s->must_flush = 1;
-        } else
-#endif //CONFIG_MUXERS
-        {
-            s->buf_end = s->buffer;
-        }
-        s->buf_ptr = s->buffer;
-        if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
-            return -EPIPE;
-        s->pos = offset;
-    }
-    s->eof_reached = 0;
     return offset;
 }
 
@@ -164,96 +92,11 @@
     return url_fseek(s, 0, SEEK_CUR);
 }
 
-offset_t url_fsize(ByteIOContext *s)
-{
-    offset_t size;
-
-    if (!s->seek)
-        return -EPIPE;
-    size = s->seek(s->opaque, -1, SEEK_END) + 1;
-    s->seek(s->opaque, s->pos, SEEK_SET);
-    return size;
-}
-
 int url_feof(ByteIOContext *s)
 {
     return s->eof_reached;
 }
 
-int url_ferror(ByteIOContext *s)
-{
-    return s->error;
-}
-
-#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
-void put_le32(ByteIOContext *s, unsigned int val)
-{
-    put_byte(s, val);
-    put_byte(s, val >> 8);
-    put_byte(s, val >> 16);
-    put_byte(s, val >> 24);
-}
-
-void put_be32(ByteIOContext *s, unsigned int val)
-{
-    put_byte(s, val >> 24);
-    put_byte(s, val >> 16);
-    put_byte(s, val >> 8);
-    put_byte(s, val);
-}
-
-void put_strz(ByteIOContext *s, const char *str)
-{
-    if (str)
-        put_buffer(s, (const unsigned char *) str, strlen(str) + 1);
-    else
-        put_byte(s, 0);
-}
-
-void put_le64(ByteIOContext *s, uint64_t val)
-{
-    put_le32(s, (uint32_t)(val & 0xffffffff));
-    put_le32(s, (uint32_t)(val >> 32));
-}
-
-void put_be64(ByteIOContext *s, uint64_t val)
-{
-    put_be32(s, (uint32_t)(val >> 32));
-    put_be32(s, (uint32_t)(val & 0xffffffff));
-}
-
-void put_le16(ByteIOContext *s, unsigned int val)
-{
-    put_byte(s, val);
-    put_byte(s, val >> 8);
-}
-
-void put_be16(ByteIOContext *s, unsigned int val)
-{
-    put_byte(s, val >> 8);
-    put_byte(s, val);
-}
-
-void put_le24(ByteIOContext *s, unsigned int val)
-{
-    put_le16(s, val & 0xffff);
-    put_byte(s, val >> 16);
-}
-
-void put_be24(ByteIOContext *s, unsigned int val)
-{
-    put_be16(s, val >> 8);
-    put_byte(s, val);
-}
-
-void put_tag(ByteIOContext *s, const char *tag)
-{
-    while (*tag) {
-        put_byte(s, *tag++);
-    }
-}
-#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
-
 /* Input stream */
 
 static void fill_buffer(ByteIOContext *s)
@@ -263,20 +106,11 @@
     /* no need to do anything if EOF already reached */
     if (s->eof_reached)
         return;
-
-    if(s->update_checksum){
-        if(s->buf_end > s->checksum_ptr)
-            s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_end - s->checksum_ptr);
-        s->checksum_ptr= s->buffer;
-    }
-
     len = s->read_packet(s->opaque, s->buffer, s->buffer_size);
     if (len <= 0) {
         /* do not modify buffer if EOF reached so that a seek back can
            be done without rereading data */
         s->eof_reached = 1;
-    if(len<0)
-        s->error= len;
     } else {
         s->pos += len;
         s->buf_ptr = s->buffer;
@@ -284,20 +118,6 @@
     }
 }
 
-unsigned long get_checksum(ByteIOContext *s){
-    s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
-    s->update_checksum= NULL;
-    return s->checksum;
-}
-
-void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum){
-    s->update_checksum= update_checksum;
-    if(s->update_checksum){
-        s->checksum= checksum;
-        s->checksum_ptr= s->buf_ptr;
-    }
-}
-
 /* NOTE: return 0 if EOF, so you cannot use it if EOF handling is
    necessary */
 /* XXX: put an inline version */
@@ -338,28 +158,10 @@
         if (len > size)
             len = size;
         if (len == 0) {
-            if(size > s->buffer_size && !s->update_checksum){
-                len = s->read_packet(s->opaque, buf, size);
-                if (len <= 0) {
-                    /* do not modify buffer if EOF reached so that a seek back can
-                    be done without rereading data */
-                    s->eof_reached = 1;
-                    if(len<0)
-                        s->error= len;
-                    break;
-                } else {
-                    s->pos += len;
-                    size -= len;
-                    buf += len;
-                    s->buf_ptr = s->buffer;
-                    s->buf_end = s->buffer/* + len*/;
-                }
-            }else{
-                fill_buffer(s);
-                len = s->buf_end - s->buf_ptr;
-                if (len == 0)
-                    break;
-            }
+            fill_buffer(s);
+            len = s->buf_end - s->buf_ptr;
+            if (len == 0)
+                break;
         } else {
             memcpy(buf, s->buf_ptr, len);
             buf += len;
@@ -370,25 +172,6 @@
     return size1 - size;
 }
 
-int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size)
-{
-    int len;
-
-    if(size<0)
-        return -1;
-
-    len = s->buf_end - s->buf_ptr;
-    if (len == 0) {
-        fill_buffer(s);
-        len = s->buf_end - s->buf_ptr;
-    }
-    if (len > size)
-        len = size;
-    memcpy(buf, s->buf_ptr, len);
-    s->buf_ptr += len;
-    return len;
-}
-
 unsigned int get_le16(ByteIOContext *s)
 {
     unsigned int val;
@@ -397,19 +180,13 @@
     return val;
 }
 
-unsigned int get_le24(ByteIOContext *s)
-{
-    unsigned int val;
-    val = get_le16(s);
-    val |= get_byte(s) << 16;
-    return val;
-}
-
 unsigned int get_le32(ByteIOContext *s)
 {
     unsigned int val;
-    val = get_le16(s);
-    val |= get_le16(s) << 16;
+    val = get_byte(s);
+    val |= get_byte(s) << 8;
+    val |= get_byte(s) << 16;
+    val |= get_byte(s) << 24;
     return val;
 }
 
@@ -429,19 +206,25 @@
     return val;
 }
 
-unsigned int get_be24(ByteIOContext *s)
+unsigned int get_be32(ByteIOContext *s)
 {
     unsigned int val;
-    val = get_be16(s) << 8;
+    val = get_byte(s) << 24;
+    val |= get_byte(s) << 16;
+    val |= get_byte(s) << 8;
     val |= get_byte(s);
     return val;
 }
-unsigned int get_be32(ByteIOContext *s)
+
+double get_be64_double(ByteIOContext *s)
 {
-    unsigned int val;
-    val = get_be16(s) << 16;
-    val |= get_be16(s);
-    return val;
+    union {
+        double d;
+        uint64_t ull;
+    } u;
+
+    u.ull = get_be64(s);
+    return u.d;
 }
 
 char *get_strz(ByteIOContext *s, char *buf, int maxlen)
@@ -453,7 +236,7 @@
         if (i < maxlen-1)
             buf[i++] = c;
     }
-
+    
     buf[i] = 0; /* Ensure null terminated, but may be truncated */
 
     return buf;
@@ -469,15 +252,7 @@
 
 /* link with avio functions */
 
-#ifdef CONFIG_MUXERS
-static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
-{
-    URLContext *h = opaque;
-    return url_write(h, buf, buf_size);
-}
-#else
-#define         url_write_packet NULL
-#endif //CONFIG_MUXERS
+#define	url_write_packet NULL
 
 static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
 {
@@ -485,34 +260,33 @@
     return url_read(h, buf, buf_size);
 }
 
-static offset_t url_seek_packet(void *opaque, offset_t offset, int whence)
+static int url_seek_packet(void *opaque, int64_t offset, int whence)
 {
     URLContext *h = opaque;
-    return url_seek(h, offset, whence);
-    //return 0;
+    url_seek(h, offset, whence);
+    return 0;
 }
 
 int url_fdopen(ByteIOContext *s, URLContext *h)
 {
     uint8_t *buffer;
     int buffer_size, max_packet_size;
-
-
+    
     max_packet_size = url_get_max_packet_size(h);
     if (max_packet_size) {
         buffer_size = max_packet_size; /* no need to bufferize more than one packet */
     } else {
         buffer_size = IO_BUFFER_SIZE;
     }
-    buffer = av_malloc(buffer_size);
+    buffer = av_mallocz(buffer_size);
     if (!buffer)
         return -ENOMEM;
 
-    if (init_put_byte(s, buffer, buffer_size,
-                      (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
+    if (init_put_byte(s, buffer, buffer_size, 
+                      (h->flags & URL_WRONLY) != 0, h,
                       url_read_packet, url_write_packet, url_seek_packet) < 0) {
-        av_free(buffer);
-        return AVERROR_IO;
+        free(buffer);
+        return -EIO;
     }
     s->is_streamed = h->is_streamed;
     s->max_packet_size = max_packet_size;
@@ -527,11 +301,11 @@
     if (!buffer)
         return -ENOMEM;
 
-    av_free(s->buffer);
+    free(s->buffer);
     s->buffer = buffer;
     s->buffer_size = buf_size;
     s->buf_ptr = buffer;
-    if (!s->write_flag)
+    if (!s->write_flag) 
         s->buf_end = buffer;
     else
         s->buf_end = buffer + buf_size;
@@ -556,11 +330,26 @@
     return 0;
 }
 
+int url_vfdopen(ByteIOContext *s, VFSFile *fd)
+{
+    URLContext *h;
+    int err;
+
+    err = url_vopen(&h, fd);
+    if (err < 0)
+        return err;
+    err = url_fdopen(s, h);
+    if (err < 0) {
+        return err;
+    }
+    return 0;
+}
+
 int url_fclose(ByteIOContext *s)
 {
     URLContext *h = s->opaque;
-
-    av_free(s->buffer);
+    
+    free(s->buffer);
     memset(s, 0, sizeof(ByteIOContext));
     return url_close(h);
 }
@@ -570,22 +359,6 @@
     return s->opaque;
 }
 
-#ifdef CONFIG_MUXERS
-/* XXX: currently size is limited */
-int url_fprintf(ByteIOContext *s, const char *fmt, ...)
-{
-    va_list ap;
-    char buf[4096];
-    int ret;
-
-    va_start(ap, fmt);
-    ret = vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    put_buffer(s, buf, strlen(buf));
-    return ret;
-}
-#endif //CONFIG_MUXERS
-
 /* note: unlike fgets, the EOL character is not returned and a whole
    line is parsed. return NULL if first char read was EOF */
 char *url_fgets(ByteIOContext *s, char *buf, int buf_size)
@@ -609,11 +382,11 @@
     return buf;
 }
 
-/*
+/* 
  * Return the maximum packet size associated to packetized buffered file
  * handle. If the file is not packetized (stream like http or file on
  * disk), then 0 is returned.
- *
+ * 
  * @param h buffered file handle
  * @return maximum packet size in bytes
  */
@@ -622,167 +395,3 @@
     return s->max_packet_size;
 }
 
-#ifdef CONFIG_MUXERS
-/* buffer handling */
-int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
-{
-    return init_put_byte(s, buf, buf_size,
-                         (flags & URL_WRONLY || flags & URL_RDWR),
-                         NULL, NULL, NULL, NULL);
-}
-
-/* return the written or read size */
-int url_close_buf(ByteIOContext *s)
-{
-    put_flush_packet(s);
-    return s->buf_ptr - s->buffer;
-}
-
-/* output in a dynamic buffer */
-
-typedef struct DynBuffer {
-    int pos, size, allocated_size;
-    uint8_t *buffer;
-    int io_buffer_size;
-    uint8_t io_buffer[1];
-} DynBuffer;
-
-static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
-{
-    DynBuffer *d = opaque;
-    int new_size, new_allocated_size;
-
-    /* reallocate buffer if needed */
-    new_size = d->pos + buf_size;
-    new_allocated_size = d->allocated_size;
-    if(new_size < d->pos || new_size > INT_MAX/2)
-        return -1;
-    while (new_size > new_allocated_size) {
-        if (!new_allocated_size)
-            new_allocated_size = new_size;
-        else
-            new_allocated_size += new_allocated_size / 2 + 1;
-    }
-
-    if (new_allocated_size > d->allocated_size) {
-        d->buffer = av_realloc(d->buffer, new_allocated_size);
-        if(d->buffer == NULL)
-             return -1234;
-        d->allocated_size = new_allocated_size;
-    }
-    memcpy(d->buffer + d->pos, buf, buf_size);
-    d->pos = new_size;
-    if (d->pos > d->size)
-        d->size = d->pos;
-    return buf_size;
-}
-
-static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
-{
-    unsigned char buf1[4];
-    int ret;
-
-    /* packetized write: output the header */
-    buf1[0] = (buf_size >> 24);
-    buf1[1] = (buf_size >> 16);
-    buf1[2] = (buf_size >> 8);
-    buf1[3] = (buf_size);
-    ret= dyn_buf_write(opaque, buf1, 4);
-    if(ret < 0)
-        return ret;
-
-    /* then the data */
-    return dyn_buf_write(opaque, buf, buf_size);
-}
-
-static offset_t dyn_buf_seek(void *opaque, offset_t offset, int whence)
-{
-    DynBuffer *d = opaque;
-
-    if (whence == SEEK_CUR)
-        offset += d->pos;
-    else if (whence == SEEK_END)
-        offset += d->size;
-    if (offset < 0 || offset > 0x7fffffffLL)
-        return -1;
-    d->pos = offset;
-    return 0;
-}
-
-static int url_open_dyn_buf_internal(ByteIOContext *s, int max_packet_size)
-{
-    DynBuffer *d;
-    int io_buffer_size, ret;
-
-    if (max_packet_size)
-        io_buffer_size = max_packet_size;
-    else
-        io_buffer_size = 1024;
-
-    if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
-        return -1;
-    d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
-    if (!d)
-        return -1;
-    d->io_buffer_size = io_buffer_size;
-    d->buffer = NULL;
-    d->pos = 0;
-    d->size = 0;
-    d->allocated_size = 0;
-    ret = init_put_byte(s, d->io_buffer, io_buffer_size,
-                        1, d, NULL,
-                        max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
-                        max_packet_size ? NULL : dyn_buf_seek);
-    if (ret == 0) {
-        s->max_packet_size = max_packet_size;
-    }
-    return ret;
-}
-
-/*
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int url_open_dyn_buf(ByteIOContext *s)
-{
-    return url_open_dyn_buf_internal(s, 0);
-}
-
-/*
- * Open a write only packetized memory stream with a maximum packet
- * size of 'max_packet_size'.  The stream is stored in a memory buffer
- * with a big endian 4 byte header giving the packet size in bytes.
- *
- * @param s new IO context
- * @param max_packet_size maximum packet size (must be > 0)
- * @return zero if no error.
- */
-int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size)
-{
-    if (max_packet_size <= 0)
-        return -1;
-    return url_open_dyn_buf_internal(s, max_packet_size);
-}
-
-/*
- * Return the written size and a pointer to the buffer. The buffer
- *  must be freed with av_free().
- * @param s IO context
- * @param pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer)
-{
-    DynBuffer *d = s->opaque;
-    int size;
-
-    put_flush_packet(s);
-
-    *pbuffer = d->buffer;
-    size = d->size;
-    av_free(d);
-    return size;
-}
-#endif //CONFIG_MUXERS