[vlc-commits] x264.c: move mbtree closer to other bitrate options

[Ilkka Ollakka]

vlc/vlc-1.2 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Thu Jan  5 12:50:38 2012 +0200| [78227855f6696e1829182efe889c9c006a49dcdc] | committer: Jean-Baptiste Kempf

x264.c: move mbtree closer to other bitrate options
(cherry picked from commit 140a7dbc9bcb4cb717fd955e98d4c27abc077ffe)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=78227855f6696e1829182efe889c9c006a49dcdc
---

 modules/codec/x264.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index e76b89e..e914c72 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -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" );
 
 
+    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" ) )
         p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
 
@@ -1218,9 +1221,6 @@ static int  Open ( vlc_object_t *p_this )
         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,
        but only once for the whole application. Since pthreadw32
        doesn't keep a refcount, do it ourselves. */