diff --git a/libavfilter/maskedmerge.h b/libavfilter/maskedmerge.h index a8c7551bad7c726410cf4193449c1d639f519738..8e2b1cf676c14cb90707ce1a4486543e5c7a10e1 100644 --- a/libavfilter/maskedmerge.h +++ b/libavfilter/maskedmerge.h @@ -27,6 +27,7 @@ typedef struct MaskedMergeContext { const AVClass *class; int width[4], height[4]; + int linesize[4]; int nb_planes; int planes; int half, depth; diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index 2c42d62d8a6e3715cccea5592e0de52a31916dd4..cf8a56814eca6d6a666d56343baf18205fc5b4c8 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -91,7 +91,7 @@ static int process_frame(FFFrameSync *fs) for (p = 0; p < s->nb_planes; p++) { if (!((1 << p) & s->planes)) { av_image_copy_plane(out->data[p], out->linesize[p], base->data[p], base->linesize[p], - s->width[p], s->height[p]); + s->linesize[p], s->height[p]); continue; } @@ -229,6 +229,9 @@ static int config_output(AVFilterLink *outlink) outlink->sample_aspect_ratio = base->sample_aspect_ratio; outlink->frame_rate = base->frame_rate; + if ((ret = av_image_fill_linesizes(s->linesize, outlink->format, outlink->w)) < 0) + return ret; + if ((ret = ff_framesync_init(&s->fs, ctx, 3)) < 0) return ret;