har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/overlay: correct small error in intersection detection

Browse Source 
The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
This commit is contained in:
Benedict Endemann 2013-10-26 15:22:44 +02:00 committed by Stefano Sabatini
parent 2c7c2a53b9
commit 696aa74b1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_overlay.c
View File

@ -346,8 +346,8 @@ static void blend_image(AVFilterContext *ctx,
const int dst_w = dst->width;
const int dst_h = dst->height;
if (x >= dst_w || x+dst_w < 0 ||
y >= dst_h || y+dst_h < 0)
if (x >= dst_w || x+src_w < 0 ||
y >= dst_h || y+src_h < 0)
return; /* no intersection */
if (s->main_is_packed_rgb) {