ffmpeg | branch: master | Paul B Mahol <[email protected]> | Fri Apr 27 19:15:55 2018 +0200| [b473e76876d9008dfbedf00b35a471e71b41f3b8] | committer: Paul B Mahol
avfilter/vf_mix: use correct linesizes Signed-off-by: Paul B Mahol <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b473e76876d9008dfbedf00b35a471e71b41f3b8 --- libavfilter/vf_mix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 37c592ffc0..9ae61c59d2 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -143,7 +143,7 @@ static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) int val = 0; for (i = 0; i < s->nb_inputs; i++) { - uint8_t src = in[i]->data[p][y * s->linesize[p] + x]; + uint8_t src = in[i]->data[p][y * in[i]->linesize[p] + x]; val += src * s->weights[i]; } @@ -165,7 +165,7 @@ static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) int val = 0; for (i = 0; i < s->nb_inputs; i++) { - uint16_t src = AV_RN16(in[i]->data[p] + y * s->linesize[p] + x * 2); + uint16_t src = AV_RN16(in[i]->data[p] + y * in[i]->linesize[p] + x * 2); val += src * s->weights[i]; } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
