From 8fbc6aae75403a7bbca595df9d3d3a9d835dc576 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 28 Aug 2006 18:44:49 +0000 Subject: move some functions to bitstream.h to avoid conflicts between different bitstream readers in different codecs Originally committed as revision 6117 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/bitstream.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'libavcodec/bitstream.c') diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 7eee0229a8..3eb1a6d745 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -47,41 +47,6 @@ void ff_put_string(PutBitContext * pbc, char *s, int put_zero) 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 -- cgit v1.2.3