diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c index d3e829d9ff99954b83846389c5b6a8bc8b4a16e8..46806187c843488c8d660002cbbbab6b4f944277 100644 --- a/modules/video_chroma/i420_yuy2.c +++ b/modules/video_chroma/i420_yuy2.c @@ -44,10 +44,10 @@ #define SRC_FOURCC "I420,IYUV,YV12" #if defined (PLUGIN_PLAIN) -# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV,Y211" +# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211" # define VLC_TARGET #elif defined (PLUGIN_SSE2) -# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV" +# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422" # define VLC_TARGET VLC_SSE #elif defined (PLUGIN_ALTIVEC) # define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422" @@ -81,9 +81,6 @@ vlc_module_end () VIDEO_FILTER_WRAPPER( I420_YUY2 ) VIDEO_FILTER_WRAPPER( I420_YVYU ) VIDEO_FILTER_WRAPPER( I420_UYVY ) -#if !defined (PLUGIN_ALTIVEC) -VIDEO_FILTER_WRAPPER( I420_IUYV ) -#endif #if defined (PLUGIN_PLAIN) VIDEO_FILTER_WRAPPER( I420_Y211 ) #endif @@ -102,11 +99,6 @@ GetFilterOperations( filter_t *p_filter ) case VLC_CODEC_UYVY: return &I420_UYVY_ops; -#if !defined (PLUGIN_ALTIVEC) - case VLC_FOURCC('I','U','Y','V'): - return &I420_IUYV_ops; -#endif - #if defined (PLUGIN_PLAIN) case VLC_CODEC_Y211: return &I420_Y211_ops; @@ -760,19 +752,6 @@ static void I420_UYVY( filter_t *p_filter, picture_t *p_source, #endif // defined(PLUGIN_SSE2) } -#if !defined (PLUGIN_ALTIVEC) -/***************************************************************************** - * I420_IUYV: planar YUV 4:2:0 to interleaved packed UYVY 4:2:2 - *****************************************************************************/ -static void I420_IUYV( filter_t *p_filter, picture_t *p_source, - picture_t *p_dest ) -{ - VLC_UNUSED(p_source); VLC_UNUSED(p_dest); - /* FIXME: TODO ! */ - msg_Err( p_filter, "I420_IUYV unimplemented, please harass <sam@zoy.org>" ); -} -#endif // !defined (PLUGIN_ALTIVEC) - /***************************************************************************** * I420_Y211: planar YUV 4:2:0 to packed YUYV 2:1:1 *****************************************************************************/ diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c index f0d6a2f2ba6a335a217c83a3d338cb0f2bf22f67..8d514ef683058085c93e97600372f27543f84bfe 100644 --- a/modules/video_chroma/i422_yuy2.c +++ b/modules/video_chroma/i422_yuy2.c @@ -39,9 +39,9 @@ #define SRC_FOURCC "I422" #if defined (PLUGIN_PLAIN) -# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV,Y211" +# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211" #else -# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV" +# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422" #endif /***************************************************************************** @@ -70,7 +70,6 @@ vlc_module_end () VIDEO_FILTER_WRAPPER( I422_YUY2 ) VIDEO_FILTER_WRAPPER( I422_YVYU ) VIDEO_FILTER_WRAPPER( I422_UYVY ) -VIDEO_FILTER_WRAPPER( I422_IUYV ) #if defined (PLUGIN_PLAIN) VIDEO_FILTER_WRAPPER( I422_Y211 ) #endif @@ -90,9 +89,6 @@ GetFilterOperations(filter_t *filter) case VLC_CODEC_UYVY: return &I422_UYVY_ops; - case VLC_FOURCC('I','U','Y','V'): - return &I422_IUYV_ops; - #if defined (PLUGIN_PLAIN) case VLC_CODEC_Y211: return &I422_Y211_ops; @@ -408,17 +404,6 @@ static void I422_UYVY( filter_t *p_filter, picture_t *p_source, #endif } -/***************************************************************************** - * I422_IUYV: planar YUV 4:2:2 to interleaved packed IUYV 4:2:2 - *****************************************************************************/ -static void I422_IUYV( filter_t *p_filter, picture_t *p_source, - picture_t *p_dest ) -{ - VLC_UNUSED(p_source); VLC_UNUSED(p_dest); - /* FIXME: TODO ! */ - msg_Err( p_filter, "I422_IUYV unimplemented, please harass <sam@zoy.org>" ); -} - /***************************************************************************** * I422_Y211: planar YUV 4:2:2 to packed YUYV 2:1:1 *****************************************************************************/