diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:58:43 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:58:43 +0100 |
| commit | 2f42aef3e40c03699bab028c8951f8d2fbc85540 (patch) | |
| tree | 8495a186a6eee07cb725e1fbd219ba76aa8b1055 /libavcodec | |
| parent | b6e88bf323bb2b23f5f1e29547aa61fa2c1e2e2c (diff) | |
| parent | 17cb56b35672a2cd6ad7abe926e6cc772b8f4710 (diff) | |
| download | ffmpeg-2f42aef3e40c03699bab028c8951f8d2fbc85540.tar.gz | |
Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'
* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
ffv1: Remove broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -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 31433e3782..7f1bc4fcf4 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 35f54c6ff9..7f31606775 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -252,14 +252,7 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState *const state, av_assert2(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); |