* Fix some configuration options declerations and strings

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index abb92c6ec2a5c2697f0d3ec6f0f68dcf5f8cab1a..73aa459fafd761c7c6002b94dac20fa27bfc94ad 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -136,19 +136,19 @@
 #define SOUT_MUX_TITLE N_( "Muxers" )
 #define SOUT_MUX_HELP N_( "Muxers are the encapsulation formats that are used to " \
                           "put all the elementary streams (video, audio, ...) " \
-                          "together. This setting allows you to always force a muxer." \
+                          "together. This setting allows you to always force a muxer. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each muxer." )
 #define SOUT_ACO_TITLE N_( "Access output" )
-#define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent." \
-                          "This setting allows you to always force an access output." \
+#define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent. " \
+                          "This setting allows you to always force an access output. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each access output.")
 
 #define SOUT_PACKET_TITLE N_( "Packetizers" )
 #define SOUT_PACKET_HELP N_( "Packetizers are used to \"preprocess\" the elementary "\
-                              "streams before muxing." \
-                          "This setting allows you to always force a packetizer." \
+                              "streams before muxing. " \
+                          "This setting allows you to always force a packetizer. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each packetizer." )
 

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 89db71db03d2987979aef6cae775d5e3c812e44f..2f78a96ed516f4e90f4bc69eead79564dd2fd29c 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -93,7 +93,7 @@ vlc_module_begin();
                 RECURSIVE_LONGTEXT, VLC_FALSE );
       change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
 #ifdef HAVE_STRSEP
-    add_string( "ignore-filetypes", "m3u,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
+    add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
                 NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
 #endif
     set_callbacks( Open, Close );

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 0cf6297d5ec748aa658e073940ee2125c2a4a1c3..ca47914d3bbd7dba51f64865756397e01713d51b 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -63,10 +63,10 @@ vlc_module_begin();
     set_callbacks( OpenDecoder, CloseDecoder );
     add_shortcut( "fake" );
 
-    add_string( "fake-file", "", NULL, FILE_TEXT,
-                FILE_LONGTEXT, VLC_TRUE );
+    add_file( "fake-file", "", NULL, FILE_TEXT,
+                FILE_LONGTEXT, VLC_FALSE );
     add_string( "fake-aspect-ratio", "4:3", NULL,
-                ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
+                ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
 vlc_module_end();
 
 /*****************************************************************************

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 339d863e4a3db9cd45d70274e4c0661d61b3310a..da2219e289ca67d1233312ab2cd0506b62e797ce 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -63,8 +63,7 @@
     "Allows you to deinterlace the video before encoding." )
 #define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
 #define DEINTERLACE_MODULE_LONGTEXT N_( \
-    "Specifies the deinterlace module to use (ffmpeg-deinterlace or " \
-    "deinterlace)." )
+    "Specifies the deinterlace module to use." )
 #define WIDTH_TEXT N_("Video width")
 #define WIDTH_LONGTEXT N_( \
     "Allows you to specify the output video width." )
@@ -141,6 +140,11 @@
 #define HURRYUP_LONGTEXT N_( "Allows you to specify if the transcoder " \
   "should drop frames if your CPU can't keep up with the encoding rate." )
 
+static char *ppsz_deinterlace_type[] =
+{
+    "deinterlace", "ffmpeg-deinterlace"
+};
+
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -172,6 +176,7 @@ vlc_module_begin();
     add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
                 DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
                 VLC_FALSE );
+        change_string_list( ppsz_deinterlace_type, 0, 0 );
     add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
                  WIDTH_LONGTEXT, VLC_TRUE );
     add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,