Merge remote-tracking branch 'qatar/master'

* qatar/master: vf_interlace: better handling of odd video size Conflicts: libavfilter/vf_interlace.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 86d1a5d80f
parent bc82405188 bec509db43
commit 86d1a5d80f
1 changed files with 1 additions and 1 deletions
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@ -132,7 +132,7 @@ static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,

        av_assert0(linesize >= 0);

-        lines /= 2;
+        lines = (lines + (field_type == FIELD_UPPER)) / 2;
        if (field_type == FIELD_LOWER)
            srcp += src_frame->linesize[plane];
        if (field_type == FIELD_LOWER)