diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:58:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:58:49 +0100 |
| commit | 5068bcda95c2a53a9b27d096e52f72f9bac62c8b (patch) | |
| tree | fcd68d78aaf62d7e59cb1d8be708b8621e6a144c /libavfilter/vf_delogo.c | |
| parent | d1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe (diff) | |
| parent | 7194330bcd6db8dc5c22e0c162a0992d519307f9 (diff) | |
| download | ffmpeg-5068bcda95c2a53a9b27d096e52f72f9bac62c8b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_delogo: fix copying the input frame.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_delogo.c')
| -rw-r--r-- | libavfilter/vf_delogo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 9a22a63b63..bf0ac62117 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -83,8 +83,8 @@ static void apply_delogo(uint8_t *dst, int dst_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; + 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, |