diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:15:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:23:29 +0200 |
| commit | 050b48f39783d7af05fc805fc4278a97941e7436 (patch) | |
| tree | 9c4e8488954ed5e7b31b7477c68adfd71f4d3c53 /libswscale/yuv2rgb.c | |
| parent | a06f0cef5bd4bef57338e3396ea903a3d887a0e4 (diff) | |
| parent | 6c5eac9a603a91a707d030d96ba97e2ef6b3ce50 (diff) | |
| download | ffmpeg-streaming-050b48f39783d7af05fc805fc4278a97941e7436.zip ffmpeg-streaming-050b48f39783d7af05fc805fc4278a97941e7436.tar.gz | |
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/yuv2rgb.c')
| -rw-r--r-- | libswscale/yuv2rgb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index d12abda..93800d2 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -276,8 +276,8 @@ YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) LOADCHROMA(3); PUTRGBA(dst_2, py_2, pa_1, 3, 24); PUTRGBA(dst_1, py_1, pa_2, 3, 24); - pa_1 += 8; \ - pa_2 += 8; \ + pa_1 += 8; + pa_2 += 8; ENDYUV2RGBLINE(8, 0) LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 24); @@ -286,8 +286,8 @@ ENDYUV2RGBLINE(8, 0) LOADCHROMA(1); PUTRGBA(dst_2, py_2, pa_1, 1, 24); PUTRGBA(dst_1, py_1, pa_2, 1, 24); - pa_1 += 4; \ - pa_2 += 4; \ + pa_1 += 4; + pa_2 += 4; ENDYUV2RGBLINE(8, 1) LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 24); @@ -310,8 +310,8 @@ YUV2RGBFUNC(yuva2argb_c, uint32_t, 1) LOADCHROMA(3); PUTRGBA(dst_2, py_2, pa_2, 3, 0); PUTRGBA(dst_1, py_1, pa_1, 3, 0); - pa_1 += 8; \ - pa_2 += 8; \ + pa_1 += 8; + pa_2 += 8; ENDYUV2RGBLINE(8, 0) LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 0); @@ -320,8 +320,8 @@ ENDYUV2RGBLINE(8, 0) LOADCHROMA(1); PUTRGBA(dst_2, py_2, pa_2, 1, 0); PUTRGBA(dst_1, py_1, pa_1, 1, 0); - pa_1 += 4; \ - pa_2 += 4; \ + pa_1 += 4; + pa_2 += 4; ENDYUV2RGBLINE(8, 1) LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 0); |
