* added ffmpeg cvsroot (not in use atm)

* forced some config options on ffmpeg

extras/contrib/src/Makefile

@@ -2,7 +2,7 @@
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.2 2003/11/15 13:09:02 massiot Exp $
+# $Id: Makefile,v 1.3 2003/11/15 22:02:15 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #
@@ -515,6 +515,12 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 # ffmpeg
 # ***************************************************************************
 
+#ffmpeg:
+#	cvs -d $(FFMPEG_CVSROOT) login
+#	cvs -d $(FFMPEG_CVSROOT) co ffmpeg
+#	patch -p 0 < Patches/ffmpeg.patch.cvs
+#	(cd $@; ./bootstrap)
+
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	$(WGET) $(FFMPEG_URL)
 
@@ -523,7 +529,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
 	patch -p 0 < Patches/ffmpeg.patch
 
 .ffmpeg: ffmpeg
-	(cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-mp3lame --enable-pp && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
+	(cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-mp3lame --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
 	touch $@
 
 CLEAN_FILE += .ffmpeg

extras/contrib/src/packages.mak

@@ -2,7 +2,7 @@
 # src/packages.mak : Archives locations
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN   
-# $Id: packages.mak,v 1.1 2003/11/15 01:21:48 massiot Exp $
+# $Id: packages.mak,v 1.2 2003/11/15 22:02:15 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #
@@ -69,6 +69,7 @@ LIBMATROSKA_VERSION=20031021
 LIBMATROSKA_URL=$(VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
+FFMPEG_CVSOOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg
 OPENSLP_VERSION=1.0.11
 OPENSLP_URL=$(SF)/openslp/openslp-$(OPENSLP_VERSION).tar.gz
 LIBDVDCSS_VERSION=1.2.8