[vlc-devel] commit: x264: Correct commit 40deedec9c7d79429fe6049436a2b8be992a178a ( Derk-Jan Hartman )

[git version control]

vlc | branch: 0.9-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Fri Apr  3 23:21:27 2009 +0200| [a53532548d770aa02c89e2bbde1734dc87244598] | committer: Derk-Jan Hartman 

x264: Correct commit 40deedec9c7d79429fe6049436a2b8be992a178a

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 7b7425f..cab95e2 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -431,14 +431,11 @@ vlc_module_begin();
 #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,