diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:19:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:20:26 +0100 |
| commit | 977abf9aedec429d9c384058a6e3f39a2969b459 (patch) | |
| tree | 07315b5db4866e918937ee2726a1fa222cd13361 | |
| parent | ef25595b71817909344ae1d8efc81e0723cab625 (diff) | |
| parent | 91c981857bc65829ed6cdfd2ddaec396fd9ee372 (diff) | |
| download | ffmpeg-977abf9aedec429d9c384058a6e3f39a2969b459.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 3033cd7555921242cbdc06d0d8aee9f8925d6a3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index e31bc35837..455e7c25a8 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1929,19 +1929,20 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL #if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, - const uint8_t *unused0, - const uint8_t *src1, - const uint8_t *src2, - int w, uint32_t *unused); + const uint8_t *unused, + const uint8_t *src1, + const uint8_t *src2, + int w, + uint32_t *unused2); static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, int width, int height, int srcStride, int dst1Stride, int dst2Stride) { int h; - for (h=0; h < height; h++) { + for (h = 0; h < height; h++) { RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL); - src += srcStride; + src += srcStride; dst1 += dst1Stride; dst2 += dst2Stride; } |