[vlc-devel] [PATCH] contrib: allow build ffmpeg/libav command line tools

[Steve Lhomme]

This is often convenient to compare what we do in VLC compared to the CLI tools.
---
 contrib/src/ffmpeg/rules.mak | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 46e52ae55c0..177b137d8c8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -4,6 +4,9 @@
 #USE_LIBAV ?= 1
 #USE_FFMPEG ?= 1
 
+# Uncomment to build command line ffmpeg/libav
+# HAVE_FFMPEG_CLI := 1
+
 ifndef USE_LIBAV
 FFMPEG_HASH=d0e740b8fb30f02914594d00eb311a32442a63f8
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
@@ -28,7 +31,6 @@ FFMPEGCONF = \
 	--disable-debug \
 	--disable-avdevice \
 	--disable-devices \
-	--disable-avfilter \
 	--disable-filters \
 	--disable-protocol=concat \
 	--disable-bsfs \
@@ -93,6 +95,10 @@ else
 FFMPEGCONF += --optflags=-O0
 endif
 
+ifndef HAVE_FFMPEG_CLI
+FFMPEGCONF += --disable-avfilter
+endif
+
 ifdef HAVE_CROSS_COMPILE
 FFMPEGCONF += --enable-cross-compile --disable-programs
 ifndef HAVE_DARWIN_OS
@@ -257,4 +263,7 @@ endif
 		--extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \
 		--prefix="$(PREFIX)" --enable-static --disable-shared
 	cd $< && $(MAKE) install-libs install-headers
+ifdef HAVE_FFMPEG_CLI
+	cd $< && $(MAKE) install-progs
+endif
 	touch $@
-- 
2.17.1