summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-11-03 18:26:42 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-11-03 18:26:42 +0000
commit897d3eef4c7ba35ec820dd5e2b378f8e368e9a18 (patch)
treeb507ded25ed11789a4664e5587526edcb2f815d2 /libavformat
parent0c904db11861a5de3a9091fb018116bde5ed567f (diff)
Make get_v() available to the other demuxers
Originally committed as revision 10911 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avio.h2
-rw-r--r--libavformat/aviobuf.c11
-rw-r--r--libavformat/nutdec.c11
3 files changed, 13 insertions, 11 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 6a9cbae539..8173b2b4d6 100644
--- 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 c186aa2ea3..1be4480c0d 100644
--- 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 e3b117d8bf..c940c7ee72 100644
--- 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);