aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-01-10 14:41:47 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-20 05:03:22 -0700
commitcce791b17becc99f47e097adb93f4b4bbd382e7e (patch)
tree288ad1357a817b2fb8c884d1725d71941f9f6242
parent2539cf1c814190a017cb8986b41aa2f949e37fd9 (diff)
downloadffmpeg-cce791b17becc99f47e097adb93f4b4bbd382e7e.tar.gz
hpeldsp_template: Merge some declarations and initializations
-rw-r--r--libavcodec/hpeldsp_template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hpeldsp_template.c b/libavcodec/hpeldsp_template.c
index 76c3fd3656..9456490c55 100644
--- a/libavcodec/hpeldsp_template.c
+++ b/libavcodec/hpeldsp_template.c
@@ -133,14 +133,14 @@ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, \
ptrdiff_t line_size, \
int h) \
{ \
- int i, a0, b0, a1, b1; \
pixel *block = (pixel *) _block; \
const pixel *pixels = (const pixel *) _pixels; \
- a0 = pixels[0]; \
- b0 = pixels[1] + 2; \
+ int i, a1, b1; \
+ int a0 = pixels[0]; \
+ int b0 = pixels[1] + 2; \
+ \
a0 += b0; \
b0 += pixels[2]; \
- \
line_size /= sizeof(pixel); \
pixels += line_size; \
for (i = 0; i < h; i += 2) { \