OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f81c37e
)
vf_delogo: fix copying the input frame.
author
Anton Khirnov
<anton@khirnov.net>
Mon, 21 Jan 2013 20:48:49 +0000
(21:48 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 29 Jan 2013 06:33:02 +0000
(07:33 +0100)
CC:libav-stable@libav.org
libavfilter/vf_delogo.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_delogo.c
b/libavfilter/vf_delogo.c
index
5d56444
..
af479c2
100644
(file)
--- a/
libavfilter/vf_delogo.c
+++ b/
libavfilter/vf_delogo.c
@@
-80,12
+80,12
@@
static void apply_delogo(uint8_t *dst, int dst_linesize,
topright = src+logo_y1 * src_linesize+logo_x2-1;
botleft = src+(logo_y2-1) * src_linesize+logo_x1;
- dst += (logo_y1+1)*dst_linesize;
- src += (logo_y1+1)*src_linesize;
-
if (!direct)
av_image_copy_plane(dst, dst_linesize, src, src_linesize, w, h);
+ dst += (logo_y1 + 1) * dst_linesize;
+ src += (logo_y1 + 1) * src_linesize;
+
for (y = logo_y1+1; y < logo_y2-1; y++) {
for (x = logo_x1+1,
xdst = dst+logo_x1+1,