[vlc-devel] commit: x264 Removed pre-scenecut definitions for build 67 ( Sabourin Gilles )

[git version control]

vlc | branch: 0.9-bugfix | Sabourin Gilles <gilles.sabourin at free.fr> | Thu Mar 12 00:05:53 2009 +0100| [3fbd16578296615cf0b48ca97fc97ddd5462be98] | committer: Derk-Jan Hartman 

x264 Removed pre-scenecut definitions for build 67

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

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 68508c9..d111c76 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -75,7 +75,7 @@ static void Close( vlc_object_t * );
     "I-frames are inserted only every other keyint frames, which probably " \
     "leads to ugly encoding artifacts. Range 1 to 100." )
 
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
 #define PRESCENE_TEXT N_("Faster, less precise scenecut detection" )
 #define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \
     "Required and implied by multi-threading." )
@@ -428,7 +428,7 @@ vlc_module_begin();
                  SCENE_LONGTEXT, false );
         change_integer_range( -1, 100 );
 
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
     add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
               PRESCENE_LONGTEXT, false );
 #endif
@@ -957,9 +957,12 @@ static int  Open ( vlc_object_t *p_this )
         p_sys->param.i_scenecut_threshold = val.i_int;
 #endif
 
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
     var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val );
     p_sys->param.b_pre_scenecut = val.b_bool;
+#endif
+
+#if X264_BUILD >= 55 /* r607 */
     var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val );
     p_sys->param.b_deterministic = val.b_bool;
 #endif