RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffv1: Remove broken disabled cruft

This commit is contained in:
Diego Biurrun 2016-07-30 15:00:32 +02:00
parent b96f0ab3d2
commit 17cb56b356
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ffv1dec.c
View File

@ -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",
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);
#endif
ret = fold(v + state->bias, bits);

7
libavcodec/ffv1enc.c
View File

@ -151,14 +151,7 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState *const state,
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);
#endif
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);