From: Antoine Cellerier <dionoea@videolan.org>
Date: Sun, 9 Jul 2006 15:01:13 +0000 (+0000)
Subject: #transcode{vfilter=...} only works with video filter2 filters.
X-Git-Tag: 0.9.0-test0~10890
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cbf60127d77335c034227f8e12ad8577244dcaa0;p=vlc

#transcode{vfilter=...} only works with video filter2 filters.
---

diff --git a/include/configuration.h b/include/configuration.h
index 68797cf82b..7b9a53a822 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -79,6 +79,7 @@
    #define SUBCAT_VIDEO_VFILTER 303
    #define SUBCAT_VIDEO_TEXT 304
    #define SUBCAT_VIDEO_SUBPIC 305
+   #define SUBCAT_VIDEO_VFILTER2 306
 
 #define CAT_INPUT 4
    #define SUBCAT_INPUT_GENERAL 401
diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 97169e3c25..7578d41a5e 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -86,6 +86,10 @@
 #define VFILTER_HELP N_( \
     "Video filters are used to postprocess the video stream." )
 
+#define VFILTER2_TITLE N_("Filters (v2)" )
+#define VFILTER2_HELP N_( \
+    "Video filters are used to postprocess the video stream." )
+
 #define SUBPIC_TITLE N_( "Subtitles/OSD")
 #define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\
         " subtitles and \"overlay subpictures\".")
@@ -313,6 +317,7 @@ static struct config_category_t categories_array[] =
     { SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_TITLE, VIDEO_GENERAL_HELP },
     { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
     { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
+    { SUBCAT_VIDEO_VFILTER2, VFILTER2_TITLE, VFILTER2_HELP },
     { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 935cfe5574..450f4ba8cc 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -217,7 +217,7 @@ vlc_module_begin();
                  MAXWIDTH_LONGTEXT, VLC_TRUE );
     add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
                  MAXHEIGHT_LONGTEXT, VLC_TRUE );
-    add_module_list_cat( SOUT_CFG_PREFIX "vfilter", SUBCAT_VIDEO_VFILTER,
+    add_module_list_cat( SOUT_CFG_PREFIX "vfilter", SUBCAT_VIDEO_VFILTER2,
                      NULL, NULL,
                      VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
 
diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index fde9f41689..8ca7e20660 100644
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -53,7 +53,7 @@ vlc_module_begin();
     set_description( _("Video scaling filter") );
     set_capability( "video filter2", 10000 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
     set_callbacks( OpenFilter, CloseFilter );
 vlc_module_end();