generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bitstream: use AV_RB16() in LIBMPEG2_BITSTREAM_READER

Browse Source 
This makes LIBMPEG2_BITSTREAM_READER_HACK redundant, so remove it.

Originally committed as revision 14197 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2008-07-13 00:07:43 +00:00
parent c1c9046656
commit 71c465a151
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/bitstream.h
View File

@ -49,7 +49,6 @@
//#define A32_BITSTREAM_READER //#define A32_BITSTREAM_READER
# endif # endif
#endif #endif
#define LIBMPEG2_BITSTREAM_READER_HACK //add BERO
extern const uint8_t ff_reverse[256]; extern const uint8_t ff_reverse[256];
@ -484,26 +483,13 @@ static inline void skip_bits_long(GetBitContext *s, int n){
(gb)->cache= name##_cache;\ (gb)->cache= name##_cache;\
(gb)->buffer_ptr= name##_buffer_ptr;\ (gb)->buffer_ptr= name##_buffer_ptr;\
#ifdef LIBMPEG2_BITSTREAM_READER_HACK
# define UPDATE_CACHE(name, gb)\ # define UPDATE_CACHE(name, gb)\
if(name##_bit_count >= 0){\ if(name##_bit_count >= 0){\
name##_cache+= (int)be2me_16(*(uint16_t*)name##_buffer_ptr) << name##_bit_count;\ name##_cache+= AV_RB16(name##_buffer_ptr) << name##_bit_count; \
name##_buffer_ptr += 2;\
name##_bit_count-= 16;\
}\
#else
# define UPDATE_CACHE(name, gb)\
if(name##_bit_count >= 0){\
name##_cache+= ((name##_buffer_ptr[0]<<8) + name##_buffer_ptr[1]) << name##_bit_count;\
name##_buffer_ptr+=2;\ name##_buffer_ptr+=2;\
name##_bit_count-= 16;\ name##_bit_count-= 16;\
}\ }\
#endif
# define SKIP_CACHE(name, gb, num)\ # define SKIP_CACHE(name, gb, num)\
name##_cache <<= (num);\ name##_cache <<= (num);\