[SCM] ffms2/master: remove patches that were applied upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 60878799f79cd517ff45ab123f3418387f19b800
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 19 11:26:23 2011 +0200

    remove patches that were applied upstream

diff --git a/debian/patches/10_fix_GCC_build.diff b/debian/patches/10_fix_GCC_build.diff
deleted file mode 100644
index 8c9223a..0000000
--- a/debian/patches/10_fix_GCC_build.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Rico Tzschichholz <ricotz at t-online.de>
-Date: Fri Feb 18 09:07:41 2011 +0100
-Subject: add upstream patches for ftbfs with gcc and ffmpeg-trunk
-
-Index: ffms2/src/core/utils.cpp
-===================================================================
---- ffms2.orig/src/core/utils.cpp
-+++ ffms2/src/core/utils.cpp
-@@ -230,7 +230,7 @@
- template<class T> static void safe_aligned_reallocz(T *&ptr, size_t old_size, size_t new_size) {
- 	void *newalloc = av_mallocz(new_size);
- 	if (newalloc) {
--		memcpy(newalloc, ptr, min(old_size, new_size));
-+		memcpy(newalloc, ptr, FFMIN(old_size, new_size));
- 	}
- 	av_free(ptr);
- 	ptr = static_cast<T*>(newalloc);
diff --git a/debian/patches/11_fix_build_with_ffmpeg_tunk.diff b/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
deleted file mode 100644
index 8539de9..0000000
--- a/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Rico Tzschichholz <ricotz at t-online.de>
-Date: Fri Feb 18 09:07:41 2011 +0100
-Subject: add upstream patches for ftbfs with gcc and ffmpeg-trunk
-
---- a/src/config/libs.cpp
-+++ b/src/config/libs.cpp
-@@ -20,6 +20,10 @@
- 
- #include "msvc-config.h"
- 
-+extern "C" {
-+#include <libavutil/avutil.h>
-+}
-+
- // someone claimed that the borland c++ compiler defines _MSC_VER too,
- // but nobody cares about borland so let them suffer
- #ifdef _MSC_VER
-@@ -30,7 +34,6 @@
- #pragma comment(lib, "libmoldname.a")
- #pragma comment(lib, "libmingwex.a")
- #pragma comment(lib, "libz.a")
--#pragma comment(lib, "libavcore.a")
- #pragma comment(lib, "libavutil.a")
- #pragma comment(lib, "libavcodec.a")
- #pragma comment(lib, "libavformat.a")
diff --git a/debian/patches/series b/debian/patches/series
index 89bf4d8..63c767a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-10_fix_GCC_build.diff
-11_fix_build_with_ffmpeg_tunk.diff
 symbol-visibility.patch

-- 
ffms2 packaging