Ensure string list always has text

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 964af38e5e464c0eae62e6646f811a98e3cec159..b6362810ba0582b539cf28364afedc1df0b4210d 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -152,7 +152,7 @@ vlc_module_begin ()
               FLOAT_LONGTEXT, true )
     add_string( "directx-audio-speaker", "Windows default",
                  SPEAKER_TEXT, SPEAKER_LONGTEXT, true )
-        change_string_list( speaker_list, 0, 0 )
+        change_string_list( speaker_list, speaker_list, NULL )
     add_integer( "directx-volume", DSBVOLUME_MAX,
                  VOLUME_TEXT, VOLUME_LONGTEXT, true )
         change_integer_range( DSBVOLUME_MIN, DSBVOLUME_MAX )

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 1676484dc98fd9c7cc6c11729689920688dead28..7f4444c43628191b8d13c413fd66f45e08519ae1 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -113,7 +113,7 @@ vlc_module_begin ()
                   FILE_LONGTEXT, false )
     add_string( "audiofile-format", "s16",
                 FORMAT_TEXT, FORMAT_TEXT, true )
-        change_string_list( format_list, 0, 0 )
+        change_string_list( format_list, format_list, NULL )
     add_integer( "audiofile-channels", 0,
                  CHANNELS_TEXT, CHANNELS_LONGTEXT, true )
         change_integer_range( 0, 6 )

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 020ad71bc2ee9c291b1974e9129ece8f6cfb08ab..128773203a41b866847452b6955a977598b0226e 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -79,7 +79,7 @@ vlc_module_begin ()
                SUB_DELAY_LONGTEXT, true )
     add_string( "sub-type", "auto", N_("Subtitles format"),
                 SUB_TYPE_LONGTEXT, true )
-        change_string_list( ppsz_sub_type, NULL, NULL )
+        change_string_list( ppsz_sub_type, ppsz_sub_type, NULL )
     add_string( "sub-description", NULL, N_("Subtitles description"),
                 SUB_DESCRIPTION_LONGTEXT, true )
     set_callbacks( Open, Close )

diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 1c81007ae7bc958325ea256804af2f9d7ddcafb9..0a464ae1d02a4f03dff66e71af6108475a8b99b6 100644 (file)
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -176,7 +176,7 @@ vlc_module_begin ()
     add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace",
                 DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
                 false )
-        change_string_list( ppsz_deinterlace_type, 0, 0 )
+        change_string_list( ppsz_deinterlace_type, ppsz_deinterlace_type, NULL )
     add_integer( SOUT_CFG_PREFIX "width", 0, WIDTH_TEXT,
                  WIDTH_LONGTEXT, true )
     add_integer( SOUT_CFG_PREFIX "height", 0, HEIGHT_TEXT,

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a330d31f8d55e910e58a55a8c4f22b315141f882..24c0034cea6a8de62dcdcc047b744c7de5c5e0df 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1589,7 +1589,7 @@ vlc_module_begin ()
                    SNAP_PREFIX_LONGTEXT, false )
     add_string( "snapshot-format", "png", SNAP_FORMAT_TEXT,
                    SNAP_FORMAT_LONGTEXT, false )
-        change_string_list( ppsz_snap_formats, NULL, 0 )
+        change_string_list( ppsz_snap_formats, ppsz_snap_formats, NULL )
     add_bool( "snapshot-preview", true, SNAP_PREVIEW_TEXT,
               SNAP_PREVIEW_LONGTEXT, false )
     add_bool( "snapshot-sequential", false, SNAP_SEQUENTIAL_TEXT,