Merge commit '15ea222778caaec0877b3f9938140b707c931d96'

* commit '15ea222778caaec0877b3f9938140b707c931d96': vf_interlace: merge FIELD_LOWER check Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 82b1bcd7f9
parent 6279cb3597 15ea222778
commit 82b1bcd7f9
1 changed files with 2 additions and 2 deletions
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@ -145,10 +145,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;