[vlc-devel] commit: bframe_adaptive has been made an integer in new (X264_BUILD>=63) x264 versions. (Jean-Paul Saman )

git version control git at videolan.org
Sat Sep 20 07:51:58 CEST 2008


vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Sat Sep 20 07:49:02 2008 +0200| [08cc2b3adce67a51dc5b066a19be58db206ecde3] | committer: Jean-Paul Saman 

bframe_adaptive has been made an integer in new (X264_BUILD>=63) x264 versions.

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 84ade08..05711ce 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -433,9 +433,13 @@ vlc_module_begin();
         change_integer_range( 0, 16 );
 
 #if X264_BUILD >= 0x0013 /* r137 */
+#if X264_BUILD >= 63
+    add_integer( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT,
+                 B_ADAPT_LONGTEXT, false );
+#else
     add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT,
               B_ADAPT_LONGTEXT, false );
-
+#endif
     add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT,
                  B_BIAS_LONGTEXT, false );
         change_integer_range( -100, 100 );




More information about the vlc-devel mailing list