7 files changed, 33 insertions, 33 deletions
diff --git a/gst/deinterlace2/tvtime/greedy.c b/gst/deinterlace2/tvtime/greedy.c
index f364c094..7d4e4b3a 100644
--- a/gst/deinterlace2/tvtime/greedy.c
+++ b/gst/deinterlace2/tvtime/greedy.c
@@ -365,8 +365,8 @@ deinterlace_frame_di_greedy (GstDeinterlaceMethod * d_method,
         GST_BUFFER_DATA (object->field_history[object->history_count - 3].buf);
 
     // copy first even line
-    oil_memcpy (Dest, L1, object->line_length);
-    Dest += object->output_stride;
+    oil_memcpy (Dest, L1, object->row_stride);
+    Dest += object->row_stride;
   } else {
     InfoIsOdd = 0;
     L1 = GST_BUFFER_DATA (object->field_history[object->history_count - 2].buf);
@@ -379,18 +379,18 @@ deinterlace_frame_di_greedy (GstDeinterlaceMethod * d_method,
 
     // copy first even line
     oil_memcpy (Dest, GST_BUFFER_DATA (object->field_history[0].buf),
-        object->line_length);
-    Dest += object->output_stride;
+        object->row_stride);
+    Dest += object->row_stride;
     // then first odd line
-    oil_memcpy (Dest, L1, object->line_length);
-    Dest += object->output_stride;
+    oil_memcpy (Dest, L1, object->row_stride);
+    Dest += object->row_stride;
   }
 
   for (Line = 0; Line < (object->field_height - 1); ++Line) {
-    klass->scanline (self, L2, L1, L3, L2P, Dest, object->line_length);
-    Dest += object->output_stride;
-    oil_memcpy (Dest, L3, object->line_length);
-    Dest += object->output_stride;
+    klass->scanline (self, L2, L1, L3, L2P, Dest, object->row_stride);
+    Dest += object->row_stride;
+    oil_memcpy (Dest, L3, object->row_stride);
+    Dest += object->row_stride;
 
     L1 += Pitch;
     L2 += Pitch;
@@ -399,7 +399,7 @@ deinterlace_frame_di_greedy (GstDeinterlaceMethod * d_method,
   }
 
   if (InfoIsOdd) {
-    oil_memcpy (Dest, L2, object->line_length);
+    oil_memcpy (Dest, L2, object->row_stride);
   }
 }
 
diff --git a/gst/deinterlace2/tvtime/greedyh.c b/gst/deinterlace2/tvtime/greedyh.c
index 0b4dc463..a5aafd18 100644
--- a/gst/deinterlace2/tvtime/greedyh.c
+++ b/gst/deinterlace2/tvtime/greedyh.c
@@ -266,8 +266,8 @@ deinterlace_frame_di_greedyh (GstDeinterlaceMethod * d_method,
         GST_BUFFER_DATA (object->field_history[object->history_count - 3].buf);
 
     // copy first even line
-    oil_memcpy (Dest, L1, object->line_length);
-    Dest += object->output_stride;
+    oil_memcpy (Dest, L1, object->row_stride);
+    Dest += object->row_stride;
   } else {
     InfoIsOdd = 0;
     L1 = GST_BUFFER_DATA (object->field_history[object->history_count - 2].buf);
@@ -280,18 +280,18 @@ deinterlace_frame_di_greedyh (GstDeinterlaceMethod * d_method,
 
     // copy first even line
     oil_memcpy (Dest, GST_BUFFER_DATA (object->field_history[0].buf),
-        object->line_length);
-    Dest += object->output_stride;
+        object->row_stride);
+    Dest += object->row_stride;
     // then first odd line
-    oil_memcpy (Dest, L1, object->line_length);
-    Dest += object->output_stride;
+    oil_memcpy (Dest, L1, object->row_stride);
+    Dest += object->row_stride;
   }
 
   for (Line = 0; Line < (object->field_height - 1); ++Line) {
-    klass->scanline (self, L1, L2, L3, L2P, Dest, object->line_length);
-    Dest += object->output_stride;
-    oil_memcpy (Dest, L3, object->line_length);
-    Dest += object->output_stride;
+    klass->scanline (self, L1, L2, L3, L2P, Dest, object->row_stride);
+    Dest += object->row_stride;
+    oil_memcpy (Dest, L3, object->row_stride);
+    Dest += object->row_stride;
 
     L1 += Pitch;
     L2 += Pitch;
@@ -300,7 +300,7 @@ deinterlace_frame_di_greedyh (GstDeinterlaceMethod * d_method,
   }
 
   if (InfoIsOdd) {
-    oil_memcpy (Dest, L2, object->line_length);
+    oil_memcpy (Dest, L2, object->row_stride);
   }
 }
 
diff --git a/gst/deinterlace2/tvtime/scalerbob.c b/gst/deinterlace2/tvtime/scalerbob.c
index b2546e23..a37792ab 100644
--- a/gst/deinterlace2/tvtime/scalerbob.c
+++ b/gst/deinterlace2/tvtime/scalerbob.c
@@ -46,7 +46,7 @@ deinterlace_scanline_scaler_bob (GstDeinterlaceMethod * self,
     GstDeinterlace2 * parent, guint8 * out,
     GstDeinterlaceScanlineData * scanlines, gint width)
 {
-  oil_memcpy (out, scanlines->t0, parent->line_length);
+  oil_memcpy (out, scanlines->t0, parent->row_stride);
 }
 
 G_DEFINE_TYPE (GstDeinterlaceMethodScalerBob, gst_deinterlace_method_scaler_bob,
diff --git a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
index f014aeb4..89ed39e4 100644
--- a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
@@ -80,8 +80,8 @@ void FUNCT_NAME(GstDeinterlaceMethod *d_method, GstDeinterlace2* object, GstBuff
 
   /* double stride do address just every odd/even scanline */
   src_pitch = object->field_stride;
-  dst_pitch = object->output_stride;
-  rowsize   = object->line_length;
+  dst_pitch = object->row_stride;
+  rowsize   = object->row_stride;
   FldHeight = object->field_height;
 
   pCopySrc   = GST_BUFFER_DATA(object->field_history[object->history_count-1].buf);
diff --git a/gst/deinterlace2/tvtime/weave.c b/gst/deinterlace2/tvtime/weave.c
index da0c79a1..09732a3a 100644
--- a/gst/deinterlace2/tvtime/weave.c
+++ b/gst/deinterlace2/tvtime/weave.c
@@ -47,14 +47,14 @@ deinterlace_scanline_weave (GstDeinterlaceMethod * self,
     GstDeinterlace2 * parent, guint8 * out,
     GstDeinterlaceScanlineData * scanlines, gint width)
 {
-  oil_memcpy (out, scanlines->m1, parent->line_length);
+  oil_memcpy (out, scanlines->m1, parent->row_stride);
 }
 
 static void
 copy_scanline (GstDeinterlaceMethod * self, GstDeinterlace2 * parent,
     guint8 * out, GstDeinterlaceScanlineData * scanlines, gint width)
 {
-  oil_memcpy (out, scanlines->m0, parent->line_length);
+  oil_memcpy (out, scanlines->m0, parent->row_stride);
 }
 
 G_DEFINE_TYPE (GstDeinterlaceMethodWeave, gst_deinterlace_method_weave,
diff --git a/gst/deinterlace2/tvtime/weavebff.c b/gst/deinterlace2/tvtime/weavebff.c
index 2da05bdc..4ddf5a51 100644
--- a/gst/deinterlace2/tvtime/weavebff.c
+++ b/gst/deinterlace2/tvtime/weavebff.c
@@ -47,7 +47,7 @@ deinterlace_scanline_weave (GstDeinterlaceMethod * self,
     GstDeinterlace2 * parent, guint8 * out,
     GstDeinterlaceScanlineData * scanlines, gint width)
 {
-  oil_memcpy (out, scanlines->m1, parent->line_length);
+  oil_memcpy (out, scanlines->m1, parent->row_stride);
 }
 
 static void
@@ -56,9 +56,9 @@ copy_scanline (GstDeinterlaceMethod * self, GstDeinterlace2 * parent,
 {
   /* FIXME: original code used m2 and m0 but this looks really bad */
   if (scanlines->bottom_field) {
-    oil_memcpy (out, scanlines->bb2, parent->line_length);
+    oil_memcpy (out, scanlines->bb2, parent->row_stride);
   } else {
-    oil_memcpy (out, scanlines->bb0, parent->line_length);
+    oil_memcpy (out, scanlines->bb0, parent->row_stride);
   }
 }
 
diff --git a/gst/deinterlace2/tvtime/weavetff.c b/gst/deinterlace2/tvtime/weavetff.c
index 0b941a05..9411f51b 100644
--- a/gst/deinterlace2/tvtime/weavetff.c
+++ b/gst/deinterlace2/tvtime/weavetff.c
@@ -47,7 +47,7 @@ deinterlace_scanline_weave (GstDeinterlaceMethod * self,
     GstDeinterlace2 * parent, guint8 * out,
     GstDeinterlaceScanlineData * scanlines, gint width)
 {
-  oil_memcpy (out, scanlines->m1, parent->line_length);
+  oil_memcpy (out, scanlines->m1, parent->row_stride);
 }
 
 static void
@@ -56,9 +56,9 @@ copy_scanline (GstDeinterlaceMethod * self, GstDeinterlace2 * parent,
 {
   /* FIXME: original code used m2 and m0 but this looks really bad */
   if (scanlines->bottom_field) {
-    oil_memcpy (out, scanlines->bb0, parent->line_length);
+    oil_memcpy (out, scanlines->bb0, parent->row_stride);
   } else {
-    oil_memcpy (out, scanlines->bb2, parent->line_length);
+    oil_memcpy (out, scanlines->bb2, parent->row_stride);
   }
 }