From 08399ac46114bf30f9690ba8077327d7259181c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 15 Aug 2012 00:56:44 +0300
Subject: [PATCH] Ensure string list always has text

---
 modules/audio_output/directx.c           | 2 +-
 modules/audio_output/file.c              | 2 +-
 modules/demux/subtitle.c                 | 2 +-
 modules/stream_out/transcode/transcode.c | 2 +-
 src/libvlc-module.c                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 964af38e5e..b6362810ba 100644
--- 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 1676484dc9..7f4444c436 100644
--- 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 020ad71bc2..128773203a 100644
--- 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 1c81007ae7..0a464ae1d0 100644
--- 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 a330d31f8d..24c0034cea 100644
--- 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,
-- 
GitLab