diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2006-08-28 18:44:49 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-08-28 18:44:49 +0000 |
commit | 8fbc6aae75403a7bbca595df9d3d3a9d835dc576 (patch) | |
tree | fb61b3b5a7a58dfed02108d26c7c126b818a7235 /libavcodec/bitstream.c | |
parent | 1b4f17fafaebaaad52ef436e9288e2cb3ef7b396 (diff) | |
download | ffmpeg-8fbc6aae75403a7bbca595df9d3d3a9d835dc576.tar.gz |
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
Diffstat (limited to 'libavcodec/bitstream.c')
-rw-r--r-- | libavcodec/bitstream.c | 35 |
1 files changed, 0 insertions, 35 deletions
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 |