diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:24:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:29:42 +0100 |
| commit | a00d4c5956e178296c31a631679618be4910ba5a (patch) | |
| tree | dd8c4ae7365165403d572b50aefa8f916e968688 /libavcodec/pngdsp.c | |
| parent | b361a0bf1fbbfa3d090e6d8db5aca6cbed8260b3 (diff) | |
| parent | c598b569fb3d1f4b6c4868fe64f6989254df5186 (diff) | |
| download | ffmpeg-a00d4c5956e178296c31a631679618be4910ba5a.tar.gz | |
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdsp.c')
| -rw-r--r-- | libavcodec/pngdsp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 5ab1c351b2..d2753163da 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -25,13 +25,13 @@ #include "pngdsp.h" // 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size -#define pb_7f (~0UL/255 * 0x7f) -#define pb_80 (~0UL/255 * 0x80) +#define pb_7f (~0UL / 255 * 0x7f) +#define pb_80 (~0UL / 255 * 0x80) static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int) sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80); @@ -45,5 +45,6 @@ av_cold void ff_pngdsp_init(PNGDSPContext *dsp) dsp->add_bytes_l2 = add_bytes_l2_c; dsp->add_paeth_prediction = ff_add_png_paeth_prediction; - if (ARCH_X86) ff_pngdsp_init_x86(dsp); + if (ARCH_X86) + ff_pngdsp_init_x86(dsp); } |