[vlc-devel] commit: Clean more correctly ( Felix Paul Kühne )

git version control git at videolan.org
Thu Jun 12 03:23:26 CEST 2008


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jun 12 03:25:09 2008 +0200| [c6d27a64d05464580eac38e765d87a0f68310dfc]

Clean more correctly

Use a ffmpeg revision which suits our state of patches

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6d27a64d05464580eac38e765d87a0f68310dfc
---

 extras/contrib/Makefile     |    2 +-
 extras/contrib/src/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index bc74a3c..d7b2dcf 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -25,7 +25,7 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
+BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk config.mak distro.mak
 
 all:
 	$(MAKE) -C src all
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index fa38277..e308ff3 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1067,7 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920
+	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 13752
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif




More information about the vlc-devel mailing list