Module: libav
Branch: release/12
Commit: 1d136012bf1544289d66334367cd57924154fd18
Author: Diego Biurrun <di...@biurrun.de>
Committer: Sean McGovern <gsean...@gmail.com>
Date: Sat Jul 30 15:00:32 2016 +0200
ffv1: Remove broken disabled cruft
---
libavcodec/ffv1dec.c | 5 -----
libavcodec/ffv1enc.c | 7 -------
2 files changed, 12 deletions(-)
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index b72a939..d3169ec 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 3bc22ed..0eeccff 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);
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
