Merge commit '696141e898193311c994b399a8dc60713709092f'

* commit '696141e898193311c994b399a8dc60713709092f':
  vf_interlace: use image width rather than linesize

Conflicts:
	libavfilter/vf_interlace.c

See: f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/vf_interlace.c
index 2828e36680eeefb6c8d35a63327588bad69eaab9,3e2a044ca0ccee0c5ea4819e150ef5cb8056e91a..8e3c069fa3910979414e0ce377af37fa1417a122
--- 1/libavfilter/vf_interlace.c
--- 2/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@@ -136,8 -136,8 +137,8 @@@ static void copy_picture_field(Interlac
      int plane, j;
  
      for (plane = 0; plane < desc->nb_components; plane++) {
 -        int lines = (plane == 1 || plane == 2) ? -(-inlink->h) >> vsub : inlink->h;
+         int cols  = (plane == 1 || plane == 2) ? -(-inlink->w) >> hsub : inlink->w;
-         ptrdiff_t linesize = av_image_get_linesize(inlink->format, inlink->w, plane);
 +        int lines = (plane == 1 || plane == 2) ? FF_CEIL_RSHIFT(inlink->h, vsub) : inlink->h;
          uint8_t *dstp = dst_frame->data[plane];
          const uint8_t *srcp = src_frame->data[plane];