diff bitstream.c @ 3648:c44d798b06b5 libavcodec

move some functions to bitstream.h to avoid conflicts between different bitstream readers in different codecs
author aurel
date Mon, 28 Aug 2006 18:44:49 +0000
parents 2ab6ec6259b1
children c8c591fe26f8
line wrap: on
line diff
--- a/bitstream.c	Mon Aug 28 16:15:40 2006 +0000
+++ b/bitstream.c	Mon Aug 28 18:44:49 2006 +0000
@@ -47,41 +47,6 @@
         put_bits(pbc, 8, 0);
 }
 
-/* bit input functions */
-
-/**
- * reads 0-32 bits.
- */
-unsigned int get_bits_long(GetBitContext *s, int n){
-    if(n<=17) return get_bits(s, n);
-    else{
-        int ret= get_bits(s, 16) << (n-16);
-        return ret | get_bits(s, n-16);
-    }
-}
-
-/**
- * shows 0-32 bits.
- */
-unsigned int show_bits_long(GetBitContext *s, int n){
-    if(n<=17) return show_bits(s, n);
-    else{
-        GetBitContext gb= *s;
-        int ret= get_bits_long(s, n);
-        *s= gb;
-        return ret;
-    }
-}
-
-int check_marker(GetBitContext *s, const char *msg)
-{
-    int bit= get_bits1(s);
-    if(!bit)
-            av_log(NULL, AV_LOG_INFO, "Marker bit missing %s\n", msg);
-
-    return bit;
-}
-
 /* VLC decoding */
 
 //#define DEBUG_VLC