From: Hugo Beauzee-Luyssen <beauze.h@gmail.com>
Date: Thu, 20 Aug 2009 19:23:46 +0000 (+0200)
Subject: Solved I420_Rgb build
X-Git-Tag: 1.1.0-ff~4096
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0f65c7cdfc6d4fc5735163bebbfb3898d0f2ce82;p=vlc

Solved I420_Rgb build

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 28303f79a9..04fef312e4 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -39,6 +39,17 @@
 #include "i420_rgb.h"
 #if defined (MODULE_NAME_IS_i420_rgb)
 #   include "i420_rgb_c.h"
+    static picture_t *I420_RGB8_Filter         ( filter_t *, picture_t * );
+//    static picture_t *I420_RGB16_dither_Filter ( filter_t *, picture_t * );
+    static picture_t *I420_RGB16_Filter        ( filter_t *, picture_t * );
+    static picture_t *I420_RGB32_Filter        ( filter_t *, picture_t * );
+#else
+    static picture_t *I420_R5G5B5_Filter       ( filter_t *, picture_t * );
+    static picture_t *I420_R5G6B5_Filter       ( filter_t *, picture_t * );
+    static picture_t *I420_A8R8G8B8_Filter     ( filter_t *, picture_t * );
+    static picture_t *I420_R8G8B8A8_Filter     ( filter_t *, picture_t * );
+    static picture_t *I420_B8G8R8A8_Filter     ( filter_t *, picture_t * );
+    static picture_t *I420_A8B8G8R8_Filter     ( filter_t *, picture_t * );
 #endif
 
 /*****************************************************************************
@@ -296,6 +307,7 @@ static void Deactivate( vlc_object_t *p_this )
 #if defined (MODULE_NAME_IS_i420_rgb)
 VIDEO_FILTER_WRAPPER( I420_RGB8 )
 VIDEO_FILTER_WRAPPER( I420_RGB16 )
+//VIDEO_FILTER_WRAPPER( I420_RGB16_dither )
 VIDEO_FILTER_WRAPPER( I420_RGB32 )
 #else
 VIDEO_FILTER_WRAPPER( I420_R5G5B5 )
diff --git a/modules/video_chroma/i420_rgb.h b/modules/video_chroma/i420_rgb.h
index 260f63e6af..66171fbeee 100644
--- a/modules/video_chroma/i420_rgb.h
+++ b/modules/video_chroma/i420_rgb.h
@@ -60,10 +60,6 @@ void I420_RGB8         ( filter_t *, picture_t *, picture_t * );
 void I420_RGB16_dither ( filter_t *, picture_t *, picture_t * );
 void I420_RGB16        ( filter_t *, picture_t *, picture_t * );
 void I420_RGB32        ( filter_t *, picture_t *, picture_t * );
-static picture_t *I420_RGB8_Filter         ( filter_t *, picture_t * );
-static picture_t *I420_RGB16_dither_Filter ( filter_t *, picture_t * );
-static picture_t *I420_RGB16_Filter        ( filter_t *, picture_t * );
-static picture_t *I420_RGB32_Filter        ( filter_t *, picture_t * );
 #else // if defined(MODULE_NAME_IS_i420_rgb_mmx)
 void I420_R5G5B5       ( filter_t *, picture_t *, picture_t * );
 void I420_R5G6B5       ( filter_t *, picture_t *, picture_t * );
@@ -71,12 +67,6 @@ void I420_A8R8G8B8     ( filter_t *, picture_t *, picture_t * );
 void I420_R8G8B8A8     ( filter_t *, picture_t *, picture_t * );
 void I420_B8G8R8A8     ( filter_t *, picture_t *, picture_t * );
 void I420_A8B8G8R8     ( filter_t *, picture_t *, picture_t * );
-static picture_t *I420_R5G5B5_Filter       ( filter_t *, picture_t * );
-static picture_t *I420_R5G6B5_Filter       ( filter_t *, picture_t * );
-static picture_t *I420_A8R8G8B8_Filter     ( filter_t *, picture_t * );
-static picture_t *I420_R8G8B8A8_Filter     ( filter_t *, picture_t * );
-static picture_t *I420_B8G8R8A8_Filter     ( filter_t *, picture_t * );
-static picture_t *I420_A8B8G8R8_Filter     ( filter_t *, picture_t * );
 #endif
 
 /*****************************************************************************