From: Ilkka Ollakka <ileoo@videolan.org>
Date: Sun, 16 May 2010 12:30:47 +0000 (+0300)
Subject: x264: preset/tune are in from X264_BUILD >= 86
X-Git-Tag: 1.2.0-pre1~6636
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=27e306df96c937068816685406593e980a53a585;p=vlc

x264: preset/tune are in from X264_BUILD >= 86
---

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 96b5f2c212..f10f4c6a13 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -660,12 +660,10 @@ vlc_module_begin ()
     add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
                 STATS_LONGTEXT, false )
 
-#if X264_BUILD >= 93
     add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
         change_string_list( x264_preset_names, x264_preset_names, 0 );
     add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false )
         change_string_list( x264_tune_names, x264_tune_names, 0 );
-#endif
 
 vlc_module_end ()
 
@@ -742,7 +740,6 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->psz_stat_name = NULL;
 
     x264_param_default( &p_sys->param );
-#if X264_BUILD >= 93
     char *psz_preset = var_GetString( p_enc, SOUT_CFG_PREFIX  "preset" );
     char *psz_tune = var_GetString( p_enc, SOUT_CFG_PREFIX  "tune" );
     if( *psz_preset == '\0' )
@@ -753,7 +750,6 @@ static int  Open ( vlc_object_t *p_this )
     x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
     free( psz_preset );
     free( psz_tune );
-#endif
     p_sys->param.i_width  = p_enc->fmt_in.video.i_width;
     p_sys->param.i_height = p_enc->fmt_in.video.i_height;