[vlc-devel] commit: Rename the "Other codecs" category (Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Jan 25 22:37:03 CET 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 25 22:33:44 2010 +0100| [20693a6136663cef862e6a2e47c0466043b3cd5a] | committer: Jean-Baptiste Kempf 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=20693a6136663cef862e6a2e47c0466043b3cd5a
---

 include/vlc_config_cat.h        |    6 +++---
 modules/codec/avcodec/avcodec.c |    2 +-
 modules/codec/dmo/dmo.c         |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index f8686f8..87cd0c6 100644
--- 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 ba2cbde..147d09d 100644
--- 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 d105d93..7d82faf 100644
--- 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 ()




More information about the vlc-devel mailing list