* Applied old FreeBSD patch for dvd input by German Tischler.

[vlc] / plugins / motion / vdec_motion_inner.c

diff --git a/plugins/motion/vdec_motion_inner.c b/plugins/motion/vdec_motion_inner.c
index 33021eb0a7be183dd72f8825d6100bbf7cc43167..e3e53965e46fed252b09d263264cad03969f6ee5 100644 (file)
--- a/plugins/motion/vdec_motion_inner.c
+++ b/plugins/motion/vdec_motion_inner.c
@@ -2,7 +2,7 @@
  * vdec_motion_inner.c : motion compensation inner routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion_inner.c,v 1.1 2001/01/18 05:13:22 sam Exp $
+ * $Id: vdec_motion_inner.c,v 1.2 2001/06/07 15:27:44 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -23,6 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#include "modules_inner.h"
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -36,8 +38,8 @@
 #include "video.h"
 
 #define __MotionComponent_x_y_copy(width,height)                        \
-void MotionComponent_x_y_copy_##width##_##height(yuv_data_t * p_src,    \
-                                                 yuv_data_t * p_dest,   \
+void _M(MotionComponent_x_y_copy_##width##_##height)(yuv_data_t *p_src, \
+                                                 yuv_data_t *p_dest,    \
                                                  int i_stride)          \
 {                                                                       \
     int i_x, i_y;                                                       \
@@ -54,7 +56,7 @@ void MotionComponent_x_y_copy_##width##_##height(yuv_data_t * p_src,    \
 }
 
 #define __MotionComponent_X_y_copy(width,height)                        \
-void MotionComponent_X_y_copy_##width##_##height(yuv_data_t * p_src,    \
+void _M(MotionComponent_X_y_copy_##width##_##height)(yuv_data_t *p_src, \
                                                  yuv_data_t * p_dest,   \
                                                  int i_stride)          \
 {                                                                       \
@@ -74,7 +76,7 @@ void MotionComponent_X_y_copy_##width##_##height(yuv_data_t * p_src,    \
 }
 
 #define __MotionComponent_x_Y_copy(width,height)                        \
-void MotionComponent_x_Y_copy_##width##_##height(yuv_data_t * p_src,    \
+void _M(MotionComponent_x_Y_copy_##width##_##height)(yuv_data_t *p_src, \
                                                  yuv_data_t * p_dest,   \
                                                  int i_stride)          \
 {                                                                       \
@@ -94,7 +96,7 @@ void MotionComponent_x_Y_copy_##width##_##height(yuv_data_t * p_src,    \
 }
 
 #define __MotionComponent_X_Y_copy(width,height)                        \
-void MotionComponent_X_Y_copy_##width##_##height(yuv_data_t * p_src,    \
+void _M(MotionComponent_X_Y_copy_##width##_##height)(yuv_data_t *p_src, \
                                                  yuv_data_t * p_dest,   \
                                                  int i_stride)          \
 {                                                                       \
@@ -116,7 +118,7 @@ void MotionComponent_X_Y_copy_##width##_##height(yuv_data_t * p_src,    \
 }
 
 #define __MotionComponent_x_y_avg(width,height)                         \
-void MotionComponent_x_y_avg_##width##_##height(yuv_data_t * p_src,     \
+void _M(MotionComponent_x_y_avg_##width##_##height)(yuv_data_t * p_src, \
                                                 yuv_data_t * p_dest,    \
                                                 int i_stride)           \
 {                                                                       \
@@ -136,7 +138,7 @@ void MotionComponent_x_y_avg_##width##_##height(yuv_data_t * p_src,     \
 }
 
 #define __MotionComponent_X_y_avg(width,height)                         \
-void MotionComponent_X_y_avg_##width##_##height(yuv_data_t * p_src,     \
+void _M(MotionComponent_X_y_avg_##width##_##height)(yuv_data_t * p_src, \
                                                 yuv_data_t * p_dest,    \
                                                 int i_stride)           \
 {                                                                       \
@@ -158,7 +160,7 @@ void MotionComponent_X_y_avg_##width##_##height(yuv_data_t * p_src,     \
 }
 
 #define __MotionComponent_x_Y_avg(width,height)                         \
-void MotionComponent_x_Y_avg_##width##_##height(yuv_data_t * p_src,     \
+void _M(MotionComponent_x_Y_avg_##width##_##height)(yuv_data_t * p_src, \
                                                 yuv_data_t * p_dest,    \
                                                 int i_stride)           \
 {                                                                       \
@@ -181,7 +183,7 @@ void MotionComponent_x_Y_avg_##width##_##height(yuv_data_t * p_src,     \
 }
 
 #define __MotionComponent_X_Y_avg(width,height)                         \
-void MotionComponent_X_Y_avg_##width##_##height(yuv_data_t * p_src,     \
+void _M(MotionComponent_X_Y_avg_##width##_##height)(yuv_data_t * p_src, \
                                                 yuv_data_t * p_dest,    \
                                                 int i_stride)           \
 {                                                                       \