From 15ea222778caaec0877b3f9938140b707c931d96 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 2 Dec 2014 14:58:41 +0000 Subject: [PATCH] vf_interlace: merge FIELD_LOWER check --- libavfilter/vf_interlace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index 0b2444c188..0f551cad16 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -144,10 +144,10 @@ static void copy_picture_field(InterlaceContext *s, av_assert0(cols >= 0 || lines >= 0); lines = (lines + (field_type == FIELD_UPPER)) / 2; - if (field_type == FIELD_LOWER) + if (field_type == FIELD_LOWER) { srcp += src_frame->linesize[plane]; - if (field_type == FIELD_LOWER) dstp += dst_frame->linesize[plane]; + } if (lowpass) { int srcp_linesize = src_frame->linesize[plane] * 2; int dstp_linesize = dst_frame->linesize[plane] * 2;