virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  swscale: Use alpha from the right row in yuva2rgba_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-06 21:47:55 +02:00
parent 050b48f397 6e293d111f
commit b3e9fd1fe5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libswscale/yuv2rgb.c
View File

@@ -266,16 +266,16 @@ YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1)
PUTRGBA(dst_2, py_2, pa_2, 0, 24); PUTRGBA(dst_2, py_2, pa_2, 0, 24);
LOADCHROMA(1); LOADCHROMA(1);
PUTRGBA(dst_2, py_2, pa_1, 1, 24); PUTRGBA(dst_2, py_2, pa_2, 1, 24);
PUTRGBA(dst_1, py_1, pa_2, 1, 24); PUTRGBA(dst_1, py_1, pa_1, 1, 24);
LOADCHROMA(2); LOADCHROMA(2);
PUTRGBA(dst_1, py_1, pa_1, 2, 24); PUTRGBA(dst_1, py_1, pa_1, 2, 24);
PUTRGBA(dst_2, py_2, pa_2, 2, 24); PUTRGBA(dst_2, py_2, pa_2, 2, 24);
LOADCHROMA(3); LOADCHROMA(3);
PUTRGBA(dst_2, py_2, pa_1, 3, 24); PUTRGBA(dst_2, py_2, pa_2, 3, 24);
PUTRGBA(dst_1, py_1, pa_2, 3, 24); PUTRGBA(dst_1, py_1, pa_1, 3, 24);
pa_1 += 8; pa_1 += 8;
pa_2 += 8; pa_2 += 8;
ENDYUV2RGBLINE(8, 0) ENDYUV2RGBLINE(8, 0)
@@ -284,8 +284,8 @@ ENDYUV2RGBLINE(8, 0)
PUTRGBA(dst_2, py_2, pa_2, 0, 24); PUTRGBA(dst_2, py_2, pa_2, 0, 24);
LOADCHROMA(1); LOADCHROMA(1);
PUTRGBA(dst_2, py_2, pa_1, 1, 24); PUTRGBA(dst_2, py_2, pa_2, 1, 24);
PUTRGBA(dst_1, py_1, pa_2, 1, 24); PUTRGBA(dst_1, py_1, pa_1, 1, 24);
pa_1 += 4; pa_1 += 4;
pa_2 += 4; pa_2 += 4;
ENDYUV2RGBLINE(8, 1) ENDYUV2RGBLINE(8, 1)