| author | Benedict Endemann <bendemann@make.tv> | 2013-10-26 13:22:44 (GMT) |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-10-27 14:01:02 (GMT) |
| commit | 696aa74b1ab3199415a247f59022e1a8bf1d2ddc (patch) | |
| tree | 1cfc3479967d00565c5cdd9ebdb9aced567f0a15 | |
| parent | 2c7c2a53b9423e60e345933f4c8e60802dc66590 (diff) | |
| download | ffmpeg-696aa74b1ab3199415a247f59022e1a8bf1d2ddc.zip ffmpeg-696aa74b1ab3199415a247f59022e1a8bf1d2ddc.tar.gz ffmpeg-696aa74b1ab3199415a247f59022e1a8bf1d2ddc.tar.bz2 | |
lavfi/overlay: correct small error in intersection detection
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>
| -rw-r--r-- | libavfilter/vf_overlay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index b5ade85..89e11e8 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -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) { |