diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-24 00:33:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-24 00:33:21 +0100 |
| commit | 3a2bed1f9ebc1a3b477c54d2cdba4be0cc4f372b (patch) | |
| tree | bfcf902b273bdc6d98a63cba0c5267eb167048d5 /libswscale | |
| parent | 3848512d48206b632af9b3f0a57484e813824220 (diff) | |
| download | ffmpeg-streaming-3a2bed1f9ebc1a3b477c54d2cdba4be0cc4f372b.zip ffmpeg-streaming-3a2bed1f9ebc1a3b477c54d2cdba4be0cc4f372b.tar.gz | |
swscale/yuv2rgb: Fix width % 4 != 0 with bgr4_byte/rgb4_byte
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/yuv2rgb.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 41b603e..8ed36e4 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -608,7 +608,23 @@ YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0) LOADCHROMA(3); PUTRGB4DB(dst_2, py_2, 3, 6 + 8); PUTRGB4DB(dst_1, py_1, 3, 6); -CLOSEYUV2RGBFUNC(8) +ENDYUV2RGBLINE(8, 0) + const uint8_t *d64 = ff_dither_8x8_73[y & 7]; + const uint8_t *d128 = ff_dither_8x8_220[y & 7]; + LOADCHROMA(0); + PUTRGB4DB(dst_1, py_1, 0, 0); + PUTRGB4DB(dst_2, py_2, 0, 0 + 8); + + LOADCHROMA(1); + PUTRGB4DB(dst_2, py_2, 1, 2 + 8); + PUTRGB4DB(dst_1, py_1, 1, 2); +ENDYUV2RGBLINE(8, 1) + const uint8_t *d64 = ff_dither_8x8_73[y & 7]; + const uint8_t *d128 = ff_dither_8x8_220[y & 7]; + LOADCHROMA(0); + PUTRGB4DB(dst_1, py_1, 0, 0); + PUTRGB4DB(dst_2, py_2, 0, 0 + 8); +ENDYUV2RGBFUNC() YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0) const uint8_t *d128 = ff_dither_8x8_220[y & 7]; |
