Commit cbf60127 authored by Antoine Cellerier's avatar Antoine Cellerier

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

parent 5d4c27ec
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
#define SUBCAT_VIDEO_VFILTER 303 #define SUBCAT_VIDEO_VFILTER 303
#define SUBCAT_VIDEO_TEXT 304 #define SUBCAT_VIDEO_TEXT 304
#define SUBCAT_VIDEO_SUBPIC 305 #define SUBCAT_VIDEO_SUBPIC 305
#define SUBCAT_VIDEO_VFILTER2 306
#define CAT_INPUT 4 #define CAT_INPUT 4
#define SUBCAT_INPUT_GENERAL 401 #define SUBCAT_INPUT_GENERAL 401
......
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
#define VFILTER_HELP N_( \ #define VFILTER_HELP N_( \
"Video filters are used to postprocess the video stream." ) "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_TITLE N_( "Subtitles/OSD")
#define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\ #define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\
" subtitles and \"overlay subpictures\".") " subtitles and \"overlay subpictures\".")
...@@ -313,6 +317,7 @@ static struct config_category_t categories_array[] = ...@@ -313,6 +317,7 @@ static struct config_category_t categories_array[] =
{ SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_TITLE, VIDEO_GENERAL_HELP }, { SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_TITLE, VIDEO_GENERAL_HELP },
{ SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP }, { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
{ SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP }, { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
{ SUBCAT_VIDEO_VFILTER2, VFILTER2_TITLE, VFILTER2_HELP },
{ SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP }, { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
{ CAT_INPUT, INPUT_TITLE, INPUT_HELP }, { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
......
...@@ -217,7 +217,7 @@ vlc_module_begin(); ...@@ -217,7 +217,7 @@ vlc_module_begin();
MAXWIDTH_LONGTEXT, VLC_TRUE ); MAXWIDTH_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT, add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
MAXHEIGHT_LONGTEXT, VLC_TRUE ); 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, NULL, NULL,
VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE ); VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
......
...@@ -53,7 +53,7 @@ vlc_module_begin(); ...@@ -53,7 +53,7 @@ vlc_module_begin();
set_description( _("Video scaling filter") ); set_description( _("Video scaling filter") );
set_capability( "video filter2", 10000 ); set_capability( "video filter2", 10000 );
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER ); set_subcategory( SUBCAT_VIDEO_VFILTER2 );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
vlc_module_end(); vlc_module_end();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment