>From 87f51c45cf3ebb2ffefbba72414bf5f9c06f6351 Mon Sep 17 00:00:00 2001
From: Zeng Zhaoxiu <zhaoxiu.z...@gmail.com>
Date: Sat, 7 Mar 2015 23:42:05 +0800
Subject: [PATCH 1/1] avcodec/golomb: cleanup
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.z...@gmail.com>
---
libavcodec/golomb.h | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 1632ee3..3c73571 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -215,9 +215,7 @@ static inline int get_se_golomb(GetBitContext *gb)
static inline int get_se_golomb_long(GetBitContext *gb)
{
unsigned int buf = get_ue_golomb_long(gb);
- int sign;
-
- sign = (buf & 1) - 1;
+ int sign = (buf & 1) - 1;
return ((buf >> 1) ^ sign) + 1;
}
@@ -259,8 +257,7 @@ static inline int dirac_get_se_golomb(GetBitContext *gb)
uint32_t ret = svq3_get_ue_golomb(gb);
if (ret) {
- int sign;
- sign = -get_bits1(gb);
+ int sign = -get_bits1(gb);
ret = (ret ^ sign) - sign;
}
@@ -363,11 +360,7 @@ static inline int get_sr_golomb(GetBitContext *gb, int k,
int limit,
int esc_len)
{
int v = get_ur_golomb(gb, k, limit, esc_len);
- int sign;
-
- v++;
- sign = (v & 1) - 1;
- return ((v >> 1) ^ sign) - sign;
+ return (v >> 1) ^ -(v & 1);
}
/**
--
2.1.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
