Revert the so-called whitelisting commits that are actually blacklisting

[vlc] / modules / codec / x264.c

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 12305ea5fdbae110225e3616aa7405930edbb347..38dbf0730e8b123cc61c713c761128c0a3f76978 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -376,278 +376,228 @@ vlc_module_begin();
 
     add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT,
                  KEYINT_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT,
                  MIN_KEYINT_LONGTEXT, VLC_FALSE );
-        change_safe();
         add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ); /* Deprecated since 0.8.5 */
 
     add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT,
                  SCENE_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( -1, 100 );
 
 #if X264_BUILD >= 55 /* r607 */
     add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
               PRESCENE_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT,
                  BFRAMES_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 16 );
 
 #if X264_BUILD >= 0x0013 /* r137 */
     add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT,
               B_ADAPT_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT,
                  B_BIAS_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( -100, 100 );
 #endif
 
     add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT,
               BPYRAMID_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_bool( SOUT_CFG_PREFIX "cabac", 1, NULL, CABAC_TEXT, CABAC_LONGTEXT,
               VLC_FALSE );
-        change_safe();
 
     add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT,
                  REF_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 1, 16 );
         add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ); /* Deprecated since 0.8.5 */
 
     add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT,
               NF_LONGTEXT, VLC_FALSE );
-        change_safe();
         add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ); /* Deprecated since 0.8.5 */
 
     add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT,
                  FILTER_LONGTEXT, VLC_FALSE );
-        change_safe();
         add_deprecated_alias( SOUT_CFG_PREFIX "filter" ); /* Deprecated since 0.8.6 */
 
     add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT,
                LEVEL_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #if X264_BUILD >= 51 /* r570 */
     add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT,
               VLC_FALSE );
-        change_safe();
 #endif
 
 /* Ratecontrol */
 
     add_integer( SOUT_CFG_PREFIX "qp", 26, NULL, QP_TEXT, QP_LONGTEXT,
                  VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 51 ); /* QP 0 -> lossless encoding */
 
 #if X264_BUILD >= 37 /* r334 */
     add_integer( SOUT_CFG_PREFIX "crf", 0, NULL, CRF_TEXT,
                  CRF_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 51 );
 #endif
 
     add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT,
                  QPMIN_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 51 );
         add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ); /* Deprecated since 0.8.5 */
 
     add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT,
                  QPMAX_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 51 );
         add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ); /* Deprecated since 0.8.5 */
 
     add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT,
                  QPSTEP_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 51 );
 
     add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT,
                RATETOL_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_float_range( 0, 100 );
         add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ); /* Deprecated since 0.8.5 */
 
     add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT,
                  VBV_MAXRATE_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT,
                  VBV_BUFSIZE_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT,
                VBV_INIT_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_float_range( 0, 1 );
 
     add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT,
                IPRATIO_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_float_range( 1, 2 );
 
     add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT,
                PBRATIO_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_float_range( 1, 2 );
 
 #if X264_BUILD >= 23 /* r190 */
     add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT,
                  CHROMA_QP_OFFSET_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT,
                  PASS_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 3 );
 
     add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT,
                QCOMP_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_float_range( 0, 1 );
 
     add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT,
                CPLXBLUR_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT,
                QBLUR_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 /* Analysis */
 
     /* x264 partitions = none (default). set at least "normal" mode. */
     add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT,
                 ANALYSE_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
         add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */
 
     add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT,
                 DIRECT_PRED_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_string_list( direct_pred_list, direct_pred_list_text, 0 );
 
 #if X264_BUILD >= 52 /* r573 */
     add_integer( SOUT_CFG_PREFIX "direct-8x8", 0, NULL, DIRECT_PRED_SIZE_TEXT,
                  DIRECT_PRED_SIZE_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( -1, 1 );
 #endif
 
 #if X264_BUILD >= 0x0012 /* r134 */
     add_bool( SOUT_CFG_PREFIX "weightb", 0, NULL, WEIGHTB_TEXT,
               WEIGHTB_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 24 /* r221 */
     add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT,
                 ME_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_string_list( enc_me_list, enc_me_list_text, 0 );
 
     add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT,
                  MERANGE_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 1, 64 );
 #endif
 
     add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT,
                  MVRANGE_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #if X264_BUILD >= 55 /* r607 */
     add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT,
                  MVRANGE_THREAD_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT,
                  SUBME_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 1, SUBME_MAX );
         add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */
 
 #if X264_BUILD >= 41 /* r368 */
     add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT,
               B_RDO_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 36 /* r318 */
     add_bool( SOUT_CFG_PREFIX "mixed-refs", 0, NULL, MIXED_REFS_TEXT,
               MIXED_REFS_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 23 /* r171 */
     add_bool( SOUT_CFG_PREFIX "chroma-me", 1, NULL, CHROMA_ME_TEXT,
               CHROMA_ME_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 43 /* r390 */
     add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT,
               BIME_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 30 /* r251 */
     add_bool( SOUT_CFG_PREFIX "8x8dct", 0, NULL, TRANSFORM_8X8DCT_TEXT,
               TRANSFORM_8X8DCT_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 39 /* r360 */
     add_integer( SOUT_CFG_PREFIX "trellis", 0, NULL, TRELLIS_TEXT,
                  TRELLIS_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 2 );
 #endif
 
 #if X264_BUILD >= 42 /* r384 */
     add_bool( SOUT_CFG_PREFIX "fast-pskip", 1, NULL, FAST_PSKIP_TEXT,
               FAST_PSKIP_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 46 /* r503 */
     add_bool( SOUT_CFG_PREFIX "dct-decimate", 1, NULL, DCT_DECIMATE_TEXT,
               DCT_DECIMATE_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
 #if X264_BUILD >= 44 /* r398 */
     add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT,
                  NR_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 1000 );
 #endif
 
 #if X264_BUILD >= 52 /* r573 */
     add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT,
                  DEADZONE_INTRA_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 32 );
 
     add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT,
                  DEADZONE_INTRA_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_range( 0, 32 );
 #endif
 
@@ -656,43 +606,35 @@ vlc_module_begin();
 #if X264_BUILD >= 55 /* r607 */
     add_bool( SOUT_CFG_PREFIX "non-deterministic", 0, NULL, NON_DETERMINISTIC_TEXT,
               NON_DETERMINISTIC_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT,
               ASM_LONGTEXT, VLC_FALSE );
-        change_safe();
 
     /* x264 psnr = 1 (default). disable PSNR computation for speed. */
     add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,
               PSNR_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #if X264_BUILD >= 50 /* r554 */
     /* x264 ssim = 1 (default). disable SSIM computation for speed. */
     add_bool( SOUT_CFG_PREFIX "ssim", 0, NULL, SSIM_TEXT,
               SSIM_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT,
               QUIET_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #if X264_BUILD >= 47 /* r518 */
     add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT,
                  SPS_ID_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_bool( SOUT_CFG_PREFIX "aud", 0, NULL, AUD_TEXT,
               AUD_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #if X264_BUILD >= 0x000e /* r81 */
     add_bool( SOUT_CFG_PREFIX "verbose", 0, NULL, VERBOSE_TEXT,
               VERBOSE_LONGTEXT, VLC_FALSE );
-        change_safe();
 #endif
 
     add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,