diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-03 20:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:07 +0200 |
| commit | a0976c15e69459438fa8796df435b8cda8bacb59 (patch) | |
| tree | 07ea829151af3059b01205e5ad3738f836d78328 | |
| parent | f43127a51602aec8fdcd7fe4b56f5aab77a9e1df (diff) | |
| download | ffmpeg-a0976c15e69459438fa8796df435b8cda8bacb59.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 004621a824..80e5670465 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1874,6 +1874,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" |