summaryrefslogtreecommitdiff
path: root/libavcodec/golomb.h
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-19 16:12:41 +0100
committerClément Bœsch <u@pkh.me>2017-03-19 16:12:41 +0100
commit01e188762fc4f57cda26a09f63e2d4a4b4bd753e (patch)
tree4356f5eebf78bd6aad44bf28b938041b86f88160 /libavcodec/golomb.h
parenta754fae4a7e1940ed81be54fcc824cd28ed20d2b (diff)
parent83b92a855e8e08bdec484e13ee5a7c8996224772 (diff)
Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'
* commit '83b92a855e8e08bdec484e13ee5a7c8996224772': golomb: Drop disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/golomb.h')
-rw-r--r--libavcodec/golomb.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index d9db8310dc..513d652527 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -489,19 +489,9 @@ static inline void set_te_golomb(PutBitContext *pb, int i, int range)
*/
static inline void set_se_golomb(PutBitContext *pb, int i)
{
-#if 0
- if (i <= 0)
- i = -2 * i;
- else
- i = 2 * i - 1;
-#elif 1
i = 2 * i - 1;
if (i < 0)
i ^= -1; //FIXME check if gcc does the right thing
-#else
- i = 2 * i - 1;
- i ^= (i >> 31);
-#endif
set_ue_golomb(pb, i);
}