Do not use video_filter wrapper for puzzle/magnify/logo.

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 9296c57eb9b3a0bc2465ddf764afaccba0275b24..3c1c990d7d2803733d3db1ee3304a30c0d39349e 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -274,10 +274,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
 
     /* FIXME temporary hack */
     const char *psz_module_name = psz_name;
-    if( !strcmp( psz_name, "magnify" ) ||
-        !strcmp( psz_name, "puzzle" ) ||
-        !strcmp( psz_name, "logo" ) ||
-        !strcmp( psz_name, "wall" ) ||
+    if( !strcmp( psz_name, "wall" ) ||
         !strcmp( psz_name, "panoramix" ) ||
         !strcmp( psz_name, "clone" ) )
         psz_module_name = "video_filter_wrapper";

diff --git a/modules/video_filter/wrapper.c b/modules/video_filter/wrapper.c
index 0f45f51a3b15589c70ccf71d20b38c4c45dfa72c..99ff4276e7f409d8bcfae14a4600bcda1d7b8d94 100644 (file)
--- a/modules/video_filter/wrapper.c
+++ b/modules/video_filter/wrapper.c
@@ -47,10 +47,6 @@ static void Close( vlc_object_t * );
 #define DECLARE_OPEN(name,filter) \
     static int  Open##name ( vlc_object_t *p_this ) { return Open( p_this, #name, filter ); }
 
-DECLARE_OPEN(magnify, true)
-DECLARE_OPEN(puzzle, true)
-DECLARE_OPEN(logo, true)
-
 DECLARE_OPEN(clone, false)
 DECLARE_OPEN(wall, false)
 DECLARE_OPEN(panoramix, false)
@@ -68,15 +64,6 @@ vlc_module_begin()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    DECLARE_MODULE(magnify)
-
-    add_submodule()
-    DECLARE_MODULE(puzzle)
-
-    add_submodule()
-    DECLARE_MODULE(logo)
-
-    add_submodule()
     DECLARE_MODULE(clone)
 
     add_submodule()