Commit d1121caa authored by Reimar Döffinger's avatar Reimar Döffinger

Fix get_bits_long to work with ALT_BITSTREAM_READER_LE.

Gives the same result as get_bits_long_le in vorbis.c instead
of some wild big-/little-endian mixture.

Originally committed as revision 6332 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4fde5060
...@@ -725,8 +725,13 @@ static inline void skip_bits1(GetBitContext *s){ ...@@ -725,8 +725,13 @@ static inline void skip_bits1(GetBitContext *s){
static inline unsigned int get_bits_long(GetBitContext *s, int n){ static inline unsigned int get_bits_long(GetBitContext *s, int n){
if(n<=17) return get_bits(s, n); if(n<=17) return get_bits(s, n);
else{ else{
#ifdef ALT_BITSTREAM_READER_LE
int ret= get_bits(s, 16);
return ret | (get_bits(s, n-16) << 16);
#else
int ret= get_bits(s, 16) << (n-16); int ret= get_bits(s, 16) << (n-16);
return ret | get_bits(s, n-16); return ret | get_bits(s, n-16);
#endif
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment