Commit f81c081c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs - Remove unnecessary ffmpeg patch merged in trunnk.

parent 060298d2
...@@ -1038,8 +1038,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ...@@ -1038,8 +1038,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN ifdef SVN
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
(cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \ (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
ifeq ($(HOST),i586-pc-beos) ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
endif endif
......
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment