From ceed502e29ab694df42ff9074103cd20dc0cec22 Mon Sep 17 00:00:00 2001
From: konablend <kona8lend@gmail.com>
Date: Fri, 20 Mar 2009 16:37:07 +0000
Subject: [PATCH] Cygwin: removed faad2 patch no longer required as per faad2
 bump. - added -N flag to contrib usage of patch to ignore patches which
 appear already applied.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2269 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 contrib/faad2/A00-libtool22.patch | 13 -------------
 make/include/contrib.defs         |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 contrib/faad2/A00-libtool22.patch

diff --git a/contrib/faad2/A00-libtool22.patch b/contrib/faad2/A00-libtool22.patch
deleted file mode 100644
index 4eab08487..000000000
--- a/contrib/faad2/A00-libtool22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: faad2/configure.in
-===================================================================
---- faad2.orig/configure.in
-+++ faad2/configure.in
-@@ -18,7 +18,7 @@ dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
- dnl disable for mpeg4ip plugin
--dnl AC_PROG_CXX
-+AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 5f1f9e54b..cbc70866b 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -52,7 +52,7 @@ define import.CONTRIB.defs
 
     # extra line feed is required
     define $(1).PATCH.item
-        $$(PATCH.exe) -t -p1 -d $$(1) < $$(2)
+        $$(PATCH.exe) -t -N -p1 -d $$(1) < $$(2)
 
     endef
 
-- 
2.40.0