Rename the "Other codecs" category

 - Noone knew what it was
 - Only FFmpeg+DMO were there and not being SPU_ES decoders
 - Maybe SDEC meant _S_ubtitles...
 - FFmpeg and DMO are in Video codecs now.

If you don't like this solution, I suggest merging all codecs subcat

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index f8686f8bc9f0bbc6bcb617a4b608bc08920adfda..87cd0c6959a24c0874711b1dcf4cc09e433ef315 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -109,13 +109,13 @@
 #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams." )
 
 #define VDEC_TITLE  N_( "Video codecs" )
-#define VDEC_HELP N_( "Settings for the video-only decoders and encoders." )
+#define VDEC_HELP N_( "Settings for the video, images or video+audio decoders and encoders." )
 
 #define ADEC_TITLE  N_( "Audio codecs" )
 #define ADEC_HELP N_( "Settings for the audio-only decoders and encoders." )
 
-#define SDEC_TITLE N_( "Other codecs")
-#define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders." )
+#define SDEC_TITLE N_( "Subtitles codecs")
+#define SDEC_HELP N_( "Settings for subtitles, teletext and CC decoders and encoders." )
 
 #define ADVANCED_TITLE N_("General Input" )
 #define ADVANCED_HELP N_( "General input settings. Use with care..." )

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index ba2cbdefb9f8a16b6163bb5cdfb56f7ccef0d13f..147d09dd7a2362efcabfa5b54895b46408cabc0e 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -95,7 +95,7 @@ vlc_module_begin ()
     set_shortname( "FFmpeg")
     add_shortcut( "ffmpeg" )
     set_category( CAT_INPUT )
-    set_subcategory( SUBCAT_INPUT_SCODEC )
+    set_subcategory( SUBCAT_INPUT_VCODEC )
     /* decoder main module */
 #if defined(MODULE_NAME_is_ffmpegaltivec) \
      || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index d105d93dac2d3d4031070b5056fb9ea49568ede6..7d82faf134c2404f52e33eb2bdf32e582593f2b4 100644 (file)
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -103,7 +103,7 @@ vlc_module_begin ()
     set_capability( "decoder", 1 )
     set_callbacks( DecoderOpen, DecoderClose )
     set_category( CAT_INPUT )
-    set_subcategory( SUBCAT_INPUT_SCODEC )
+    set_subcategory( SUBCAT_INPUT_VCODEC )
 
 #   define ENC_CFG_PREFIX "sout-dmo-"
     add_submodule ()