Contribs - Remove unnecessary ffmpeg patch merged in trunnk.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f4cd99ec70c26eb12da8b30278951b5b8172d8d1..c0741185b0a096b6e1c8f016a6de1213c44ac17c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1038,8 +1038,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
        $(SVN) co $(FFMPEG_SVN) ffmpeg
-       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \
-        patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
+       (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch b/extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
deleted file mode 100644 (file)
index 0aba944..0000000
--- a/extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile    (revision 8597)
-+++ Makefile    (working copy)
-@@ -149,7 +149,9 @@
- ifeq ($(CONFIG_PP),yes)
-       (MAKE) -C libpostproc install-headers
- endif
-+ifeq ($(CONFIG_SWSCALER),yes)
-       $(MAKE) -C libswscale  install-headers
-+endif
-
- uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
-