[vlc-commits] commit: x264: hrd option should be in from X264_BUILD >= 89 (Ilkka Ollakka )

git at videolan.org git at videolan.org
Mon May 10 16:08:24 CEST 2010


vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue Apr 13 16:19:28 2010 +0300| [64bb8f5615d976e592efd17c6f833d29b21af4b7] | committer: Ilkka Ollakka 

x264: hrd option should be in from X264_BUILD >= 89
(cherry picked from commit fb8075f2fac2b83f58d8e286b0b210a7b67d1ee6)

Signed-off-by: Ilkka Ollakka <ileoo at iki.fi>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=64bb8f5615d976e592efd17c6f833d29b21af4b7
---

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index a361c5b..152c1e3 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -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-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 )
         change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 );
 #endif
@@ -921,7 +921,7 @@ static int  Open ( vlc_object_t *p_this )
     if( i_val >= 1 )
         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");
     if( !strcmp( psz_val, "vbr" ) )
         p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;



More information about the vlc-commits mailing list