virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

pngdec: correctly indent macros

Browse Source
This commit is contained in:
Vittorio Giovara 2014-07-31 14:25:30 +01:00
parent 52269f48e8
commit 92a36a6b33
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/pngdec.c
View File

@ -159,7 +159,8 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top,
} }
} }
#define UNROLL1(bpp, op) { \ #define UNROLL1(bpp, op) \
{ \
r = dst[0]; \ r = dst[0]; \
if (bpp >= 2) \ if (bpp >= 2) \
g = dst[1]; \ g = dst[1]; \
@ -179,25 +180,24 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top,
continue; \ continue; \
dst[i + 3] = a = op(a, src[i + 3], last[i + 3]); \ dst[i + 3] = a = op(a, src[i + 3], last[i + 3]); \
} \ } \
} }
#define UNROLL_FILTER(op) \ #define UNROLL_FILTER(op) \
if (bpp == 1) \ if (bpp == 1) { \
UNROLL1(1, op) \ UNROLL1(1, op) \
else if (bpp == 2) \ } else if (bpp == 2) { \
UNROLL1(2, op) \ UNROLL1(2, op) \
else if (bpp == 3) \ } else if (bpp == 3) { \
UNROLL1(3, op) \ UNROLL1(3, op) \
else if (bpp == 4) \ } else if (bpp == 4) { \
UNROLL1(4, op) \ UNROLL1(4, op) \
else { \ } else { \
for (; i < size; i += bpp) { \ for (; i < size; i += bpp) { \
int j; \ int j; \
for (j = 0; j < bpp; j++) \ for (j = 0; j < bpp; j++) \
dst[i + j] = op(dst[i + j - bpp], \ dst[i + j] = op(dst[i + j - bpp], src[i + j], last[i + j]); \
src[i + j], last[i + j]); \ } \
} \ }
}
/* NOTE: 'dst' can be equal to 'last' */ /* NOTE: 'dst' can be equal to 'last' */
static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type, static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,