diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-07-30 15:00:32 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-08-17 12:16:42 +0200 |
| commit | 17cb56b35672a2cd6ad7abe926e6cc772b8f4710 (patch) | |
| tree | 9fcec63b17c54eea408b77ce561f7397a846ab4d | |
| parent | b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661 (diff) | |
| download | ffmpeg-17cb56b35672a2cd6ad7abe926e6cc772b8f4710.tar.gz | |
ffv1: Remove broken disabled cruft
| -rw-r--r-- | libavcodec/ffv1dec.c | 5 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index b72a939877..d3169ec7c5 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -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); diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 3bc22ed1e5..0eeccfffb4 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -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); |