Commit ebe1aef6 authored by michael's avatar michael

svq3_get_se_golomb() fix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3849 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent dac36f89
...@@ -167,7 +167,10 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){ ...@@ -167,7 +167,10 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){
return ff_interleaved_se_golomb_vlc_code[buf]; return ff_interleaved_se_golomb_vlc_code[buf];
}else{ }else{
buf |=1; LAST_SKIP_BITS(re, gb, 8);
UPDATE_CACHE(re, gb);
buf |= 1 | (GET_CACHE(re, gb) >> 8);
if((buf & 0xAAAAAAAA) == 0) if((buf & 0xAAAAAAAA) == 0)
return INVALID_VLC; return INVALID_VLC;
...@@ -175,7 +178,7 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){ ...@@ -175,7 +178,7 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){
buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30); buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
} }
LAST_SKIP_BITS(re, gb, 63 - 2*log); LAST_SKIP_BITS(re, gb, 63 - 2*log - 8);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1; return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
......
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