diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-03 20:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 18:28:33 +0100 |
| commit | cedb96db37236b6a02782b7747d2c5bf1211b9be (patch) | |
| tree | 641abef02f4d5bf7d7d538556117b7bb164ab119 | |
| parent | de75b4063d19dd58f73a5b09f8f56ded48f66ed7 (diff) | |
| download | ffmpeg-cedb96db37236b6a02782b7747d2c5bf1211b9be.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 7796d384bb..e71c7ebfe3 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1887,6 +1887,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" |