diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:47:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:48:03 +0200 |
| commit | b3e9fd1fe5786672c5d53e91f518419d05598ea4 (patch) | |
| tree | fe6ae75d7965ec56508cea805671b321ad3b7d38 | |
| parent | 050b48f39783d7af05fc805fc4278a97941e7436 (diff) | |
| parent | 6e293d111fcad27d52a2ef5ad77b1009f1743396 (diff) | |
| download | ffmpeg-b3e9fd1fe5786672c5d53e91f518419d05598ea4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Use alpha from the right row in yuva2rgba_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/yuv2rgb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 93800d2b74..dd33f4731b 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -266,16 +266,16 @@ YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) PUTRGBA(dst_2, py_2, pa_2, 0, 24); LOADCHROMA(1); - PUTRGBA(dst_2, py_2, pa_1, 1, 24); - PUTRGBA(dst_1, py_1, pa_2, 1, 24); + PUTRGBA(dst_2, py_2, pa_2, 1, 24); + PUTRGBA(dst_1, py_1, pa_1, 1, 24); LOADCHROMA(2); PUTRGBA(dst_1, py_1, pa_1, 2, 24); PUTRGBA(dst_2, py_2, pa_2, 2, 24); LOADCHROMA(3); - PUTRGBA(dst_2, py_2, pa_1, 3, 24); - PUTRGBA(dst_1, py_1, pa_2, 3, 24); + PUTRGBA(dst_2, py_2, pa_2, 3, 24); + PUTRGBA(dst_1, py_1, pa_1, 3, 24); pa_1 += 8; pa_2 += 8; ENDYUV2RGBLINE(8, 0) @@ -284,8 +284,8 @@ ENDYUV2RGBLINE(8, 0) PUTRGBA(dst_2, py_2, pa_2, 0, 24); LOADCHROMA(1); - PUTRGBA(dst_2, py_2, pa_1, 1, 24); - PUTRGBA(dst_1, py_1, pa_2, 1, 24); + PUTRGBA(dst_2, py_2, pa_2, 1, 24); + PUTRGBA(dst_1, py_1, pa_1, 1, 24); pa_1 += 4; pa_2 += 4; ENDYUV2RGBLINE(8, 1) |