mirror of https://git.ffmpeg.org/ffmpeg.git
ffv1: Remove broken disabled cruft
This commit is contained in:
parent
b96f0ab3d2
commit
17cb56b356
|
@ -83,12 +83,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state,
|
||||||
ff_dlog(NULL, "v:%d bias:%d error:%d drift:%d count:%d k:%d",
|
ff_dlog(NULL, "v:%d bias:%d error:%d drift:%d count:%d k:%d",
|
||||||
v, state->bias, state->error_sum, state->drift, state->count, k);
|
v, state->bias, state->error_sum, state->drift, state->count, k);
|
||||||
|
|
||||||
#if 0 // JPEG LS
|
|
||||||
if (k == 0 && 2 * state->drift <= -state->count)
|
|
||||||
v ^= (-1);
|
|
||||||
#else
|
|
||||||
v ^= ((2 * state->drift + state->count) >> 31);
|
v ^= ((2 * state->drift + state->count) >> 31);
|
||||||
#endif
|
|
||||||
|
|
||||||
ret = fold(v + state->bias, bits);
|
ret = fold(v + state->bias, bits);
|
||||||
|
|
||||||
|
|
|
@ -151,14 +151,7 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState *const state,
|
||||||
|
|
||||||
assert(k <= 13);
|
assert(k <= 13);
|
||||||
|
|
||||||
#if 0 // JPEG LS
|
|
||||||
if (k == 0 && 2 * state->drift <= -state->count)
|
|
||||||
code = v ^ (-1);
|
|
||||||
else
|
|
||||||
code = v;
|
|
||||||
#else
|
|
||||||
code = v ^ ((2 * state->drift + state->count) >> 31);
|
code = v ^ ((2 * state->drift + state->count) >> 31);
|
||||||
#endif
|
|
||||||
|
|
||||||
ff_dlog(NULL, "v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code,
|
ff_dlog(NULL, "v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code,
|
||||||
state->bias, state->error_sum, state->drift, state->count, k);
|
state->bias, state->error_sum, state->drift, state->count, k);
|
||||||
|
|
Loading…
Reference in New Issue