Skip to content

V
vlc-2-2
Commit fb8075f2 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

x264: hrd option should be in from X264_BUILD >= 89

parent 878968cc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/x264.c
View file @ fb8075f2
...@@ -481,7 +481,7 @@ vlc_module_begin () ...@@ -481,7 +481,7 @@ vlc_module_begin ()
add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, NULL, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, NULL, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, NULL, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, NULL, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, false )
#if X264_BUILD >= 92 #if X264_BUILD >= 89
add_string( SOUT_CFG_PREFIX "hrd", "none", NULL, HRD_TEXT, HRD_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "hrd", "none", NULL, HRD_TEXT, HRD_LONGTEXT, false )
change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 ); change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 );
#endif #endif
...@@ -921,7 +921,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -921,7 +921,7 @@ static int Open ( vlc_object_t *p_this )
if( i_val >= 1 ) if( i_val >= 1 )
p_sys->param.analyse.i_subpel_refine = i_val; p_sys->param.analyse.i_subpel_refine = i_val;
#if X264_BUILD >= 92 #if X264_BUILD >= 89
psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd"); psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd");
if( !strcmp( psz_val, "vbr" ) ) if( !strcmp( psz_val, "vbr" ) )
p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR; p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment