Make get_v() available to the other demuxers

Originally committed as revision 10911 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 6a9cbae539b6e83eecb5700304c80b01ba0e0de4..8173b2b4d698d40fe0c74134c2e7b951e2784167 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -192,6 +192,8 @@ unsigned int get_be24(ByteIOContext *s);
 unsigned int get_be32(ByteIOContext *s);
 uint64_t get_be64(ByteIOContext *s);
 
+uint64_t get_v(ByteIOContext *bc);
+
 static inline int url_is_streamed(ByteIOContext *s)
 {
     return s->is_streamed;

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index c186aa2ea302cf8dd8dba894a4b256ce797ccaaf..1be4480c0d8a9407f41882ab2c76c6fb1d729c9f 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -472,6 +472,17 @@ uint64_t get_be64(ByteIOContext *s)
     return val;
 }
 
+uint64_t get_v(ByteIOContext *bc){
+    uint64_t val = 0;
+    int tmp;
+
+    do{
+        tmp = get_byte(bc);
+        val= (val<<7) + (tmp&127);
+    }while(tmp&128);
+    return val;
+}
+
 /* link with avio functions */
 
 #ifdef CONFIG_MUXERS

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index e3b117d8bf93ae1881406abaf6d0198d16f82077..c940c7ee72cd33ffbbadfe21de8e3c65ed1d180f 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -27,17 +27,6 @@
 #undef NDEBUG
 #include <assert.h>
 
-static uint64_t get_v(ByteIOContext *bc){
-    uint64_t val = 0;
-    int tmp;
-
-    do{
-        tmp = get_byte(bc);
-        val= (val<<7) + (tmp&127);
-    }while(tmp&128);
-    return val;
-}
-
 static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){
     unsigned int len= get_v(bc);