diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-04 21:01:54 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-04 21:01:54 +0000 |
commit | 156ec7764eec11e78de6b7a17cef7679a9e30a63 (patch) | |
tree | a37ef9ade32aa15f51049aed533c7e7258749c6f /libmpeg2/vlc.h | |
parent | c25474941c626032141c0a142274ce6769927d86 (diff) | |
download | mpv-156ec7764eec11e78de6b7a17cef7679a9e30a63.tar.bz2 mpv-156ec7764eec11e78de6b7a17cef7679a9e30a63.tar.xz |
libmpeg2-0.2.0 merge
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@37 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/vlc.h')
-rw-r--r-- | libmpeg2/vlc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpeg2/vlc.h b/libmpeg2/vlc.h index 0bc550b803..ed2e04f882 100644 --- a/libmpeg2/vlc.h +++ b/libmpeg2/vlc.h @@ -1,6 +1,6 @@ /* * vlc.h - * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> + * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * @@ -25,14 +25,14 @@ do { \ bit_ptr += 2; \ } while (0) -static inline void bitstream_init (slice_t * slice, uint8_t * start) +static inline void bitstream_init (picture_t * picture, uint8_t * start) { - slice->bitstream_buf = 0; GETWORD (slice->bitstream_buf, 16, start); - slice->bitstream_ptr = start; - slice->bitstream_bits = 0; + picture->bitstream_buf = 0; GETWORD (picture->bitstream_buf, 16, start); + picture->bitstream_ptr = start; + picture->bitstream_bits = 0; } -// make sure that there are at least 16 valid bits in bit_buf +/* make sure that there are at least 16 valid bits in bit_buf */ #define NEEDBITS(bit_buf,bits,bit_ptr) \ do { \ if (bits > 0) { \ @@ -41,17 +41,17 @@ do { \ } \ } while (0) -// remove num valid bits from bit_buf +/* remove num valid bits from bit_buf */ #define DUMPBITS(bit_buf,bits,num) \ do { \ bit_buf <<= (num); \ bits += (num); \ } while (0) -// take num bits from the high part of bit_buf and zero extend them +/* take num bits from the high part of bit_buf and zero extend them */ #define UBITS(bit_buf,num) (((uint32_t)(bit_buf)) >> (32 - (num))) -// take num bits from the high part of bit_buf and sign extend them +/* take num bits from the high part of bit_buf and sign extend them */ #define SBITS(bit_buf,num) (((int32_t)(bit_buf)) >> (32 - (num))) typedef struct { |