[vlc-devel] commit: x264: obsolete pre-scenecut option. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 12 00:47:13 2009 +0100| [40deedec9c7d79429fe6049436a2b8be992a178a] | committer: Derk-Jan Hartman 

x264: obsolete pre-scenecut option.

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>
(cherry picked from commit d46728dff61b74e6cffd11615b7fa3a526075b0f)

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index d111c76..7b7425f 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -428,9 +428,17 @@ vlc_module_begin();
                  SCENE_LONGTEXT, false );
         change_integer_range( -1, 100 );
 
-#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
+#if X264_BUILD >= 55 /* r607 */
+#  if X264_BUILD < 67 /* r1117 */
     add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
+<<<<<<< HEAD:modules/codec/x264.c
               PRESCENE_LONGTEXT, false );
+=======
+              PRESCENE_LONGTEXT, false )
+#  else
+    add_obsolete_bool( "pre-scenecut" )
+#  endif
+>>>>>>> d46728d... x264: obsolete pre-scenecut option.:modules/codec/x264.c
 #endif
 
     add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT,