Merge commit 'b68e353136db6f963212c457281d9716516cdc59'

[ffmpeg] / libavfilter / maskedmerge.h

diff --git a/libavfilter/maskedmerge.h b/libavfilter/maskedmerge.h
index a8c7551bad7c726410cf4193449c1d639f519738..8e2b1cf676c14cb90707ce1a4486543e5c7a10e1 100644 (file)
--- 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;