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>
savonet · Jul 12, 2013 · 86d1a5d · 86d1a5d
2 parents bc82405 + bec509d
commit 86d1a5d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)