diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:08:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:08:30 +0100 |
| commit | 75cc29a8a8e68aaa81c549f563521c64ed4e2caf (patch) | |
| tree | 1673822545bb13e5f0ab33bfa5c0a1f0b792aedd | |
| parent | 76d7676fccee4febb8ddb39f53a5b9a643cb2efd (diff) | |
| parent | cce791b17becc99f47e097adb93f4b4bbd382e7e (diff) | |
| download | ffmpeg-75cc29a8a8e68aaa81c549f563521c64ed4e2caf.tar.gz | |
Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
hpeldsp_template: Merge some declarations and initializations
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hpeldsp_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hpeldsp_template.c b/libavcodec/hpeldsp_template.c index 0b3f642d2f..2b0ae8d553 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)-1; \ pixels += line_size; \ for (i = 0; i < h; i += 2) { \ |