* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e': hpeldsp_template: Merge some declarations and initializations Conflicts: libavcodec/hpeldsp_template.c
Unified · Split
| @@ -133,14 +133,14 @@ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, \ · 132 unmodified lines | ||
| 133 | 133 | ptrdiff_t line_size, \ |
| 134 | 134 | int h) \ |
| 135 | 135 | { \ |
| 136 | − int i, a0, b0, a1, b1; \ | |
| 137 | 136 | pixel *block = (pixel *) _block; \ |
| 138 | 137 | const pixel *pixels = (const pixel *) _pixels; \ |
| 139 | − a0 = pixels[0]; \ | |
| 140 | − b0 = pixels[1] + 2; \ | |
| 138 | + int i, a1, b1; \ | |
| 139 | + int a0 = pixels[0]; \ | |
| 140 | + int b0 = pixels[1] + 2; \ | |
| 141 | + \ | |
| 141 | 142 | a0 += b0; \ |
| 142 | 143 | b0 += pixels[2]; \ |
| 143 | − \ | |
| 144 | 144 | line_size >>= sizeof(pixel)-1; \ |
| 145 | 145 | pixels += line_size; \ |
| 146 | 146 | for (i = 0; i < h; i += 2) { \ |