[FFmpeg-cvslog] vf_interlace: merge FIELD_LOWER check

Vittorio Giovara git at videolan.org
Wed Jan 7 00:03:17 CET 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Dec  2 14:58:41 2014 +0000| [15ea222778caaec0877b3f9938140b707c931d96] | committer: Vittorio Giovara

vf_interlace: merge FIELD_LOWER check

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15ea222778caaec0877b3f9938140b707c931d96
---

 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 0b2444c..0f551ca 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;



More information about the ffmpeg-cvslog mailing list