Commit aa32821d authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Paul Saman

Fix contribs building for FFmpeg

--
Rafaël Carré <rcarre@m2x.nl>

commit dc9057ec9b4bb41a74bb07197c64cee8c1976fe0
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon May 19 10:08:04 2008 +0200

    Do not install swscale headers if it was not enabled
Signed-off-by: default avatarJean-Paul Saman <jpsaman@videolan.org>
parent 6c47b3d1
...@@ -9,6 +9,8 @@ configure ...@@ -9,6 +9,8 @@ configure
intl intl
libtool libtool
Makefile Makefile
!extras/contrib/Makefile
!extras/contrib/src/Makefile
Makefile.in Makefile.in
stamp-* stamp-*
vlc-config vlc-config
......
...@@ -926,6 +926,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ...@@ -926,6 +926,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) -r 7407 ffmpeg $(SVN) co $(FFMPEG_SVN) -r 7407 ffmpeg
(cd $@; patch -p 0 < ../Patches/ffmpeg-swscale-headers.patch)
ifeq ($(HOST),i586-pc-beos) ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch) (cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif endif
......
Index: Makefile
===================================================================
--- Makefile (revision 7407)
+++ Makefile (working copy)
@@ -159,7 +159,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