Commit 6dedd76b authored by michaelni's avatar michaelni

10l


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2041 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cbe325b9
...@@ -220,7 +220,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int ...@@ -220,7 +220,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
log= av_log2(buf); log= av_log2(buf);
if(log > 31-12){ if(log > 31-11){
buf >>= log - k; buf >>= log - k;
buf += (30-log)<<k; buf += (30-log)<<k;
LAST_SKIP_BITS(re, gb, 32 + k - log); LAST_SKIP_BITS(re, gb, 32 + k - log);
...@@ -385,7 +385,8 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim ...@@ -385,7 +385,8 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim
e= (i>>k) + 1; e= (i>>k) + 1;
if(e<limit){ if(e<limit){
put_bits(pb, e, 1); put_bits(pb, e, 1);
put_bits(pb, k, i&((1<<k)-1)); if(k)
put_bits(pb, k, i&((1<<k)-1));
}else{ }else{
put_bits(pb, limit , 1); put_bits(pb, limit , 1);
put_bits(pb, esc_len, i - 1); put_bits(pb, esc_len, i - 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