Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'

[ffmpeg] / libavfilter / vf_weave.c

diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c
index 6d3dd7c2996135dd8d9f43105ffaeae57718f661..037f5d1cf20643e52d5aa87208d7e50111629f73 100644 (file)
--- a/libavfilter/vf_weave.c
+++ b/libavfilter/vf_weave.c
@@ -100,20 +100,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
     for (i = 0; i < s->nb_planes; i++) {
         if (s->double_weave && !(inlink->frame_count_out & 1)) {
-            av_image_copy_plane(out->data[i] + out->linesize[i] * !s->first_field,
+            av_image_copy_plane(out->data[i] + out->linesize[i] * s->first_field,
                                 out->linesize[i] * 2,
                                 in->data[i], in->linesize[i],
                                 s->linesize[i], s->planeheight[i]);
-            av_image_copy_plane(out->data[i] + out->linesize[i] * s->first_field,
+            av_image_copy_plane(out->data[i] + out->linesize[i] * !s->first_field,
                                 out->linesize[i] * 2,
                                 s->prev->data[i], s->prev->linesize[i],
                                 s->linesize[i], s->planeheight[i]);
         } else {
-            av_image_copy_plane(out->data[i] + out->linesize[i] * s->first_field,
+            av_image_copy_plane(out->data[i] + out->linesize[i] * !s->first_field,
                                 out->linesize[i] * 2,
                                 in->data[i], in->linesize[i],
                                 s->linesize[i], s->planeheight[i]);
-            av_image_copy_plane(out->data[i] + out->linesize[i] * !s->first_field,
+            av_image_copy_plane(out->data[i] + out->linesize[i] * s->first_field,
                                 out->linesize[i] * 2,
                                 s->prev->data[i], s->prev->linesize[i],
                                 s->linesize[i], s->planeheight[i]);