Windows line endings begone!

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1465 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/patch-xvidcore-nasm-2.00-configure.patch b/contrib/patch-xvidcore-nasm-2.00-configure.patch
index b28057482e06f2de2fc24d28e1fdf13472f4e79c..44242ace424393ae19159a567e65904902277c13 100644 (file)
--- a/contrib/patch-xvidcore-nasm-2.00-configure.patch
+++ b/contrib/patch-xvidcore-nasm-2.00-configure.patch
@@ -1,13 +1,13 @@
-diff -ruN xvidcore-orig/build/generic/configure xvidcore/build/generic/configure\r
---- xvidcore-orig/build/generic/configure      2006-11-01 03:39:36.000000000 -0700\r
-+++ xvidcore/build/generic/configure   2008-01-30 20:19:48.000000000 -0700\r
-@@ -4016,7 +4016,7 @@\r
-        if test "$ac_nasm" = "yes" ; then\r
-                                             echo "$as_me:$LINENO: checking for nasm patch version" >&5\r
- echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6\r
--           nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`\r
-+           nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`\r
-            if test -z $nasm_patch ; then\r
--              nasm_patch=-1\r
-+              nasm_patch=45\r
-            fi\r
+diff -ruN xvidcore-orig/build/generic/configure xvidcore/build/generic/configure
+--- xvidcore-orig/build/generic/configure      2006-11-01 03:39:36.000000000 -0700
++++ xvidcore/build/generic/configure   2008-01-30 20:19:48.000000000 -0700
+@@ -4016,7 +4016,7 @@
+        if test "$ac_nasm" = "yes" ; then
+                                             echo "$as_me:$LINENO: checking for nasm patch version" >&5
+ echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6
+-           nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
++           nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`
+            if test -z $nasm_patch ; then
+-              nasm_patch=-1
++              nasm_patch=45
+            fi