Skip to content

V
vlc
Commit 140a7dbc authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

x264.c: move mbtree closer to other bitrate options

parent f1e222cf
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/x264.c
View file @ 140a7dbc
...@@ -847,6 +847,9 @@ static int Open ( vlc_object_t *p_this ) ...@@ -847,6 +847,9 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" ); p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" );
if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) ) if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ); p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
...@@ -1221,9 +1224,6 @@ static int Open ( vlc_object_t *p_this ) ...@@ -1221,9 +1224,6 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.rc.b_stat_read = i_val & 2; p_sys->param.rc.b_stat_read = i_val & 2;
} }
if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" );
/* We need to initialize pthreadw32 before we open the encoder, /* We need to initialize pthreadw32 before we open the encoder,
but only once for the whole application. Since pthreadw32 but only once for the whole application. Since pthreadw32
doesn't keep a refcount, do it ourselves. */ doesn't keep a refcount, do it ourselves. */
......
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