[SCM] libav/experimental: hpeldsp_template: Merge some declarations and initializations
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:16 UTC 2014
The following commit has been merged in the experimental branch:
commit cce791b17becc99f47e097adb93f4b4bbd382e7e
Author: Diego Biurrun <diego at biurrun.de>
Date: Fri Jan 10 14:41:47 2014 +0100
hpeldsp_template: Merge some declarations and initializations
diff --git a/libavcodec/hpeldsp_template.c b/libavcodec/hpeldsp_template.c
index 76c3fd3..9456490 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) { \
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list