summaryrefslogtreecommitdiff
path: root/libavcodec/intrax8dsp.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-07 21:40:16 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-07 21:40:21 +0100
commitf2c78128395e899b5b1eebe2426ca55d577363f0 (patch)
treef68aa75991107a90d4c1a70fe94cdb38da96b02d /libavcodec/intrax8dsp.c
parent741960e2f330c369933151064d6c546cbdc706d3 (diff)
parent6ebd06a9b2508747a135ee4c880d8f612e08932b (diff)
Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'
* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b': intrax8: Drop lots of pointless parentheses Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8dsp.c')
-rw-r--r--libavcodec/intrax8dsp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c
index 784c2d95c6..5520e3c8ad 100644
--- a/libavcodec/intrax8dsp.c
+++ b/libavcodec/intrax8dsp.c
@@ -91,7 +91,7 @@ static void x8_setup_spatial_compensation(uint8_t *src, uint8_t *dst,
for (i = 7; i >= 0; i--) {
c = *(ptr - 1); // area1, same mb as area2, no need to check
dst[area1 + i] = c;
- c = *(ptr);
+ c = *ptr;
sum += c;
min_pix = FFMIN(min_pix, c);
@@ -136,9 +136,9 @@ static void x8_setup_spatial_compensation(uint8_t *src, uint8_t *dst,
sum += c;
// edge pixel is not part of min/max
}
- (*range) = max_pix - min_pix;
- sum += *(dst + area5) + *(dst + area5 + 1);
- *psum = sum;
+ *range = max_pix - min_pix;
+ sum += *(dst + area5) + *(dst + area5 + 1);
+ *psum = sum;
}
static const uint16_t zero_prediction_weights[64 * 2] = {
@@ -419,7 +419,7 @@ static void x8_loop_filter(uint8_t *ptr, const int a_stride, const int b_stride,
m = (m ^ sign) - sign; // abs(m)
m >>= 1;
- x = (5 * x) >> 3;
+ x = 5 * x >> 3;
if (x > m)
x = m;