Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'

* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
  ffv1: Remove broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/ffv1dec.c
Simple merge

diff --cc libavcodec/ffv1enc.c
index 35f54c6ff9122731a1873d99da14247cb475a787,0eeccfffb4f0668b75d7b5c4a002739eb8d48a39..7f31606775e4a1b3770278833cbd865ef0d14678
--- 1/libavcodec/ffv1enc.c
--- 2/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@@ -250,16 -149,9 +250,9 @@@ static inline void put_vlc_symbol(PutBi
          i += i;
      }
  
 -    assert(k <= 13);
 +    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);