Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'

* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e': hpeldsp_template: Merge some declarations and initializations Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 75cc29a8a8
parent 76d7676fcc cce791b17b
commit 75cc29a8a8
1 changed files with 4 additions and 4 deletions
--- 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)-1;                                      \
    pixels += line_size;                                                \
    for (i = 0; i < h; i += 2) {                                        \