Fix segfault on 64 bit archs. (0 != NULL)

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index de76a3850fe547d410a791ded958abf9a01e8203..954cbf87b77a433ed6f494a062f59156af5933fc 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -192,7 +192,7 @@ vlc_module_begin();
     /* DVB-S (satellite) */
     add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT,
         INVERSION_LONGTEXT, true );
-        change_integer_list( i_inversion_list, ppsz_inversion_text, 0 );
+        change_integer_list( i_inversion_list, ppsz_inversion_text, NULL );
 #   if defined(WIN32) || defined(WINCE)
         add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
             POLARISATION_LONGTEXT, true );
@@ -230,26 +230,26 @@ vlc_module_begin();
     /* DVB-C (cable) */
     add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT,
         MODULATION_LONGTEXT, true );
-        change_integer_list( i_qam_list, ppsz_qam_text, 0 );
+        change_integer_list( i_qam_list, ppsz_qam_text, NULL );
 
     /* DVB-T (terrestrial) */
     add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT,
         CODE_RATE_HP_LONGTEXT, true );
-        change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, 0 );
+        change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL );
     add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT,
         CODE_RATE_LP_LONGTEXT, true );
-        change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, 0 );
+        change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL );
     add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
         true );
-        change_integer_list( i_band_list, ppsz_band_text, 0 );
+        change_integer_list( i_band_list, ppsz_band_text, NULL );
     add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true );
-        change_integer_list( i_guard_list, ppsz_guard_text, 0 );
+        change_integer_list( i_guard_list, ppsz_guard_text, NULL );
     add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
         TRANSMISSION_LONGTEXT, true );
-        change_integer_list( i_transmission_list, ppsz_transmission_text, 0 );
+        change_integer_list( i_transmission_list, ppsz_transmission_text, NULL );
     add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
         true );
-        change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, 0 );
+        change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL );
 
     set_capability( "access", 0 );
     add_shortcut( "dvb" );      /* Generic name */

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 7832a98445339e5796cdfbcb5f77773f9e8dc2c7..c6dd19b4e701e9ad47dcd486da2690c69e99b6ad 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -222,7 +222,7 @@ vlc_module_begin();
 
     add_integer( "dshow-tuner-input", 0, NULL, TUNER_INPUT_TEXT,
                  TUNER_INPUT_LONGTEXT, true );
-        change_integer_list( pi_tuner_input, ppsz_tuner_input_text, 0 );
+        change_integer_list( pi_tuner_input, ppsz_tuner_input_text, NULL );
 
     add_integer( "dshow-video-input",  -1, NULL, VIDEO_IN_TEXT,
                  VIDEO_IN_LONGTEXT, true );
@@ -238,7 +238,7 @@ vlc_module_begin();
 
     add_integer( "dshow-amtuner-mode", AMTUNER_MODE_TV, NULL,
                 AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, false);
-        change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, 0 );
+        change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, NULL );
 
     add_integer( "dshow-audio-channels", 0, NULL, AUDIO_CHANNELS_TEXT,
                  AUDIO_CHANNELS_LONGTEXT, true );

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index e7d255ca435399a34df79d939671b3daf4f71ca9..1bd54473d4ff2cf41c3c106a5601ddeedc0560c0 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -140,7 +140,7 @@ vlc_module_begin();
                  RADIO_DEVICE_LONGTEXT, false );
     add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT,
                  NORM_LONGTEXT, false );
-       change_integer_list( i_norm_list, psz_norm_list_text, 0 );
+       change_integer_list( i_norm_list, psz_norm_list_text, NULL );
     add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true );
     add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
                  true );
@@ -158,7 +158,7 @@ vlc_module_begin();
                  BITRATE_PEAK_LONGTEXT, true );
     add_integer( "pvr-bitrate-mode", -1, NULL, BITRATE_MODE_TEXT,
                  BITRATE_MODE_LONGTEXT, true );
-        change_integer_list( i_bitrates, psz_bitrates_list_text, 0 );
+        change_integer_list( i_bitrates, psz_bitrates_list_text, NULL );
     add_integer( "pvr-audio-bitmask", -1, NULL, BITMASK_TEXT,
                  BITMASK_LONGTEXT, true );
     add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT,

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index 72e238172e0eb53ace76743726fbb72c533a13f5..2dbfb2c4039ca8119e50f4cc12ba715236d60da3 100644 (file)
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -168,7 +168,7 @@ vlc_module_begin();
     add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true );
     add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT,
                 false );
-        change_integer_list( i_norm_list, psz_norm_list_text, 0 );
+        change_integer_list( i_norm_list, psz_norm_list_text, NULL );
     add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
                 false );
     add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true );

diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index 550b13440307b24559477ed8d5a02c4249256372..f773353644a7abe5f7bd183052dc4e1853c3d587 100644 (file)
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -282,7 +282,7 @@ vlc_module_begin();
                 false );
     add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT,
                  STANDARD_LONGTEXT, false );
-        change_integer_list( i_standards_list, psz_standards_list_text, 0 );
+        change_integer_list( i_standards_list, psz_standards_list_text, NULL );
     add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true );
     add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT,
@@ -291,7 +291,7 @@ vlc_module_begin();
                  AUDIO_INPUT_LONGTEXT, true );
     add_integer( CFG_PREFIX "io", IO_METHOD_MMAP, NULL, IOMETHOD_TEXT,
                  IOMETHOD_LONGTEXT, true );
-        change_integer_list( i_iomethod_list, psz_iomethod_list_text, 0 );
+        change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL );
     add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
                 WIDTH_LONGTEXT, true );
     add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index e2c6c6b40991b8bbb224a5d6f22a67d152b0755b..6e6be609349603a066ef8b7390b76f79402282eb 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -118,7 +118,7 @@ vlc_module_begin();
               MONO_DOWNMIX_LONGTEXT, false );
     add_integer( MONO_CFG "channel", -1, NULL, MONO_CHANNEL_TEXT,
         MONO_CHANNEL_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_MISC );

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 3fa80a5bcbb02bdce96ca5a45cdad5b2e6ac920a..32ac2237247e5e8aac1cedbd128168a245031afb 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -123,7 +123,7 @@ vlc_module_begin();
         change_integer_range( 0, 2 );
     add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
                   SKIPLOOPF_LONGTEXT, true );
-        change_integer_list( nloopf_list, nloopf_list_text, 0 );
+        change_integer_list( nloopf_list, nloopf_list_text, NULL );
 
     add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
                  true );

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 677c4012d00565ffb41df977f54346a4081c4aff..57dadf361e09d817de178b06971637bf72854507 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -95,7 +95,7 @@ vlc_module_begin();
     set_callbacks( Open, Close );
 
     add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false );
     add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false );
 

diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c
index 0ce9de2b0aadbd610338f6da7c6997961fbe3542..d14f1413e90e2fa5c4aad85ef0d5286f08d772f0 100644 (file)
--- a/modules/codec/subtitles/subsdec.c
+++ b/modules/codec/subtitles/subsdec.c
@@ -123,7 +123,7 @@ vlc_module_begin();
 
     add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
                  false );
-        change_integer_list( pi_justification, ppsz_justification_text, 0 );
+        change_integer_list( pi_justification, ppsz_justification_text, NULL );
     add_string( "subsdec-encoding", DEFAULT_NAME, NULL,
                 ENCODING_TEXT, ENCODING_LONGTEXT, false );
         change_string_list( ppsz_encodings, 0, 0 );

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 9ff2dbe669bc242981e840b5428351ecaab0fef4..0f300efb7273cb010d3e588937544395a59c80be 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -83,7 +83,7 @@ vlc_module_begin();
                ENC_QUALITY_LONGTEXT, false );
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false );
-        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, 0 );
+        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL );
     add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
               ENC_VBR_LONGTEXT, false );
     add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index c8b3b5c39a6b3abde723ca1361312cc4edcace45..f4de0fd9aa5f04a8af243026e0c082c9993cf711 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -91,7 +91,7 @@ vlc_module_begin();
     add_bool( "vbi-opaque", true, NULL,
                  OPAQUE_TEXT, OPAQUE_LONGTEXT, false );
     add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_bool( "vbi-text", false, NULL,
               TELX_TEXT, TELX_LONGTEXT, false );
 vlc_module_end();

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 5244802dbb977faaf9282adf0f92e60c7c38b4fa..2d8975cd286cc6850615b639ad862f2cf4a66970 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -71,7 +71,7 @@ vlc_module_begin();
               INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true );
     add_integer( "avi-index", 0, NULL,
               INDEX_TEXT, INDEX_LONGTEXT, false );
-        change_integer_list( pi_index, ppsz_indexes, 0 );
+        change_integer_list( pi_index, ppsz_indexes, NULL );
 
     set_callbacks( Open, Close );
 vlc_module_end();

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index 2a7e1b4eadda6e17cbf5bf4b5fbd0975826c66e9..fcfb3c53fd1484ad7f3b7de6192b8ae1531c7551 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -200,14 +200,14 @@ vlc_module_begin();
     add_integer( "fbosd-y", 0, NULL, POSY_TEXT,
                  POSY_LONGTEXT, false );
     add_integer( "fbosd-position", 8, NULL, POS_TEXT, POS_LONGTEXT, true );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     set_section( N_("Font"), NULL );
     add_integer_with_range( "fbosd-font-opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     add_integer( "fbosd-font-color", 0x00FFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                  false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( "fbosd-font-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false );
 

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 59ea6810f6cf7db1547d4c45c784d6c5ec766441..100c00237f7c15818004ee9c84d738228ec04934 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -158,7 +158,7 @@ vlc_module_begin();
 
         add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
                      QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
-            change_integer_list( i_mode_list, psz_mode_list_text, 0 );
+            change_integer_list( i_mode_list, psz_mode_list_text, NULL );
 
         add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
                   NOTIFICATION_LONGTEXT, false );

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 4bdb6e11ccb1c59548719aa37c149423fd76b2cf..8da4253f2de24c7ca252cf0a80dc45c0e988cdaa 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -147,7 +147,7 @@ vlc_module_begin();
         add_deprecated_alias( "wxwin-autosize" ); /*Deprecated since 0.8.4*/
     add_integer( "wx-playlist-view", 0, NULL, PLAYLIST_TEXT, PLAYLIST_LONGTEXT,
              false );
-        change_integer_list( pi_playlist_views, psz_playlist_views, 0 );
+        change_integer_list( pi_playlist_views, psz_playlist_views, NULL );
 /* wxCocoa pretends to support this, but at least 2.6.x doesn't */
 #ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 21e7d3aaa6e4dccce081d37adf72bf1cc56a3b98..d7c93f58a12b845e948f77a97958e92bc474df6d 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -148,14 +148,14 @@ vlc_module_begin();
     /* hook to the color values list, with default 0x00ffffff = white */
     add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
 
     add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false );
-        change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+        change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
     add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, false );
-        change_integer_list( pi_effects, ppsz_effects_text, 0 );
+        change_integer_list( pi_effects, ppsz_effects_text, NULL );
 
     add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT,
               YUVP_LONGTEXT, true );

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index f6bb1f52b0bdef4dbec612140a087be48ec2a451..e307ce779d3b4126eee70cd4959a7e6b1d44c67c 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -117,10 +117,10 @@ vlc_module_begin();
               false );
     add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false );
-        change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+        change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
     add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     set_capability( "text renderer", 120 );
     add_shortcut( "text" );
     set_callbacks( Create, Destroy );

diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index f1b8f178f1e675d357773bfe2c6fcbb5953b140f..75ad54be301c30fe23babd89b10b4bc122925a80 100644 (file)
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -104,11 +104,11 @@ vlc_module_begin();
     /* hook to the color values list, with default 0x00ffffff = white */
     add_integer( "win32text-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, true );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
 
     add_integer( "win32text-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false );
-        change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+        change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
 
     set_capability( "text renderer", 50 );
     add_shortcut( "text" );

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 442d34ba4122faeff6a92f6ee8973a86b27e4286..7c7e980bd5ccae5f64f08f3f5b54aac925b302e1 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -373,7 +373,7 @@ add_integer_with_range(CFG_PREFIX "SatWinSize",   3, 0, 5, NULL,
 add_integer(CFG_PREFIX "filtermode", (int)afmCombined, NULL,
             FILTERMODE_TEXT, FILTERMODE_LONGTEXT, false );
 
-change_integer_list(pi_filtermode_values, ppsz_filtermode_descriptions, 0 );
+change_integer_list(pi_filtermode_values, ppsz_filtermode_descriptions, NULL );
 
 add_integer_with_range(CFG_PREFIX "MeanLength",    300, 300, 5000, NULL,
                        MEANLENGTH_TEXT, MEANLENGTH_LONGTEXT, false);

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index a4e40a2c243a6b736a396f1fff416f8dad5f0c29..b27b7a5ed18b6ff92bd37cfd71d0b516451075d9 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -72,7 +72,7 @@ vlc_module_begin();
     set_capability( "video filter2", 0 );
     add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( CFG_PREFIX "saturationthres", 20, NULL,
                  _("Saturaton threshold"), "", false );
     add_integer( CFG_PREFIX "similaritythres", 15, NULL,

diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index 23716f018307be673ef1697208fab86675144001..192eda0b84e82e779ae95272d024bf55b24b7888 100644 (file)
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -81,7 +81,7 @@ vlc_module_begin();
 
     add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF,
                  NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false );
-        change_integer_list( pi_component_values, ppsz_component_descriptions, 0 );
+        change_integer_list( pi_component_values, ppsz_component_descriptions, NULL );
 
     set_callbacks( Create, Destroy );
 vlc_module_end();

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 37e51f26e70ee13b2665c4b8a2b2d30119be9088..0cfaff741cb3cde8fde3bdd5c2b7f67e0bb11546 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -118,7 +118,7 @@ vlc_module_begin();
     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
         TRANS_TEXT, TRANS_LONGTEXT, false );
     add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     /* subpicture filter submodule */
     add_submodule();

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index a170b67fd5261dccea249d4e2f3f090710b78e2c..e454ca907c5a24913e1799effd6bab0f4fa2a331 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -154,7 +154,7 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
     add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
     add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     set_section( N_("Font"), NULL );
     /* 5 sets the default to top [1] left [4] */
@@ -162,7 +162,7 @@ vlc_module_begin();
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                  false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false );
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 9dc28d70529b8b12ec007d3222ec1d0bd8e86424..8c6ac46f684cacbb0c27256e854d4a87b5ed9a3a 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -192,7 +192,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "align", 5, NULL,
                  ALIGN_TEXT, ALIGN_LONGTEXT, true);
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
+        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
 
     add_integer( CFG_PREFIX "xoffset", 0, NULL,
                  XOFFSET_TEXT, XOFFSET_LONGTEXT, true );
@@ -208,7 +208,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_integer( CFG_PREFIX "rows", 2, NULL,
                  ROWS_TEXT, ROWS_LONGTEXT, false );
     add_integer( CFG_PREFIX "cols", 2, NULL,

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 96ae0fd46380c96a8be7bf3969349cfb676da164..3e8e583530ccba94eafa488aeb4d8fa0e29778f0 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -117,7 +117,7 @@ vlc_module_begin();
     add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false );
     add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
                  false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_string( OSD_CFG "file", OSD_DEFAULT_CFG, NULL, OSD_FILE_TEXT,
         OSD_FILE_LONGTEXT, false );
     add_string( OSD_CFG "file-path", NULL, NULL, OSD_PATH_TEXT,

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 9e708e498b77e8409400f5db72d89874ce26a1a6..c0aeb36cbc4559c9716ef5e496f9446e3becebfa 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -198,7 +198,7 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
     add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
     add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     set_section( N_("Font"), NULL );
     /* 5 sets the default to top [1] left [4] */
@@ -206,7 +206,7 @@ vlc_module_begin();
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                   false );
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
+        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false );
 
     set_section( N_("Misc"), NULL );
@@ -217,7 +217,7 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false );
     add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false );
     add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false );
-        change_integer_list( pi_title_modes, ppsz_title_modes, 0 );
+        change_integer_list( pi_title_modes, ppsz_title_modes, NULL );
 
     set_description( N_("RSS and Atom feed display") );
     add_shortcut( "rss" );

diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 62693878a997cc498d0add89f98864c6814002ce..2dc3ed03bff3a7cbda37df536939307f9cc45ef8 100644 (file)
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -66,7 +66,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_callbacks( OpenScaler, CloseScaler );
     add_integer( "swscale-mode", 2, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true );
-        change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
+        change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL );
 vlc_module_end();
 
 /* Version checking */

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index b001a13e133536cac8f0bc7cef2c0f93ad23d65b..749879494ba66d03bedf58e9f7f5facda8c94fc2 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1447,7 +1447,7 @@ vlc_module_begin();
     add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, false );
     add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false );
-        change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 );
+        change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, NULL );
     add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
                  DESYNC_LONGTEXT, true );
         change_safe();
@@ -1514,7 +1514,7 @@ vlc_module_begin();
                  VIDEO_TITLE_TIMEOUT_LONGTEXT, false );
     add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT,
                  VIDEO_TITLE_POSITION_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     // autohide after 1.5s
     add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false );
@@ -1562,7 +1562,7 @@ vlc_module_begin();
     add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
                  VIDEO_TITLE_LONGTEXT, true );
     add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true );
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
+        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
     add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true );
 
 
@@ -1722,7 +1722,7 @@ vlc_module_begin();
                  CR_AVERAGE_LONGTEXT, true );
     add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
                  CLOCK_SYNCHRO_LONGTEXT, true );
-        change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
+        change_integer_list( pi_clock_values, ppsz_clock_descriptions, NULL );
 
     add_bool( "network-synchronisation", false, NULL, NETSYNC_TEXT,
               NETSYNC_LONGTEXT, true );