diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-03 20:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:49 +0100 |
| commit | 5a1061b4ad41609039ac0bcc7d127bb1ad1cd29d (patch) | |
| tree | 2eed1f101fa54c4e84b66350919d9b56b0f64600 | |
| parent | a5c43d7c87b5a2da5696f4ef5f7c0194a5e26aa8 (diff) | |
| download | ffmpeg-5a1061b4ad41609039ac0bcc7d127bb1ad1cd29d.tar.gz | |
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Fixes Ticket4151
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8524558858b7e14bc50afa10233e0194f591ab9d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 3bca43c42e..9e28f4bcb1 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1959,6 +1959,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui for (h=0; h < height; h++) { int w; + if (width >= 16) #if COMPILE_TEMPLATE_SSE2 __asm__( "xor %%"REG_a", %%"REG_a" \n\t" |