[vlc-devel] commit: x264 removed i_direct_8x8_inference from the structure from version 66 on. (Dominique Leuenberger )

git version control git at videolan.org
Sat Jan 24 18:53:37 CET 2009


vlc | branch: 0.9-bugfix | Dominique Leuenberger <dominique at leuenberger.net> | Thu Jan 22 10:20:32 2009 +0100| [9b766c861fc3bea426aeb1ca57aaf1a0b87277e8] | committer: Christophe Mutricy 

x264 removed i_direct_8x8_inference from the structure from version 66 on.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit ee759771f2029fddd683278b85fcb495ca4c661c)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b766c861fc3bea426aeb1ca57aaf1a0b87277e8
---

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index d48bb0d..68508c9 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1122,10 +1122,12 @@ static int  Open ( vlc_object_t *p_this )
     if( val.i_int >= 0 && val.i_int <= 32 )
         p_sys->param.analyse.i_luma_deadzone[1] = val.i_int;
 
+#if X264_BUILD <= 65
     var_Get( p_enc, SOUT_CFG_PREFIX "direct-8x8", &val );
     if( val.i_int >= -1 && val.i_int <= 1 )
         p_sys->param.analyse.i_direct_8x8_inference = val.i_int;
 #endif
+#endif
 
     var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val );
     if( !val.b_bool ) p_sys->param.cpu = 0;




More information about the vlc-devel mailing list