[FFmpeg-cvslog] Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 15:58:43 2017 +0100| [2f42aef3e40c03699bab028c8951f8d2fbc85540] | committer: Clément Bœsch

Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f42aef3e40c03699bab028c8951f8d2fbc85540
---

 libavcodec/ffv1dec.c | 5 -----
 libavcodec/ffv1enc.c | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 31433e3..7f1bc4f 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 35f54c6..7f31606 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);


======================================================================

diff --cc libavcodec/ffv1enc.c
index 35f54c6,0eeccff..7f31606
--- a/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);