From 1fc5449c8938f555462d11f8ff1b4f8778e098e8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 16 Feb 2007 20:46:45 +0000 Subject: [PATCH] Correct ffmpeg flags for building contribs. --- extras/contrib/src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 02feb4e937..cbad831603 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -122,7 +122,7 @@ ifdef HAVE_WINCE HOSTCONF+= --without-pic --disable-shared FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols else -FFMPEGCONF+= --enable-mp3lame --enable-faac +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac endif ifdef HAVE_BEOS @@ -922,7 +922,7 @@ ifdef HAVE_WINCE else .ffmpeg: ffmpeg .faac .lame endif - (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay --enable-swscaler && make install-libs install-headers) + (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-ffplay --enable-swscaler && make install-libs install-headers) touch $@ ifdef SVN -- 2.20.1