[FFmpeg-cvslog] r10911 - in trunk/libavformat: avio.h aviobuf.c nutdec.c

[kostya]

Author: kostya
Date: Sat Nov  3 19:26:42 2007
New Revision: 10911

Log:
Make get_v() available to the other demuxers

Modified:
   trunk/libavformat/avio.h
   trunk/libavformat/aviobuf.c
   trunk/libavformat/nutdec.c

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	(original)
+++ trunk/libavformat/avio.h	Sat Nov  3 19:26:42 2007
@@ -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;

Modified: trunk/libavformat/aviobuf.c
==============================================================================
--- trunk/libavformat/aviobuf.c	(original)
+++ trunk/libavformat/aviobuf.c	Sat Nov  3 19:26:42 2007
@@ -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

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	(original)
+++ trunk/libavformat/nutdec.c	Sat Nov  3 19:26:42 2007
@@ -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);