[vlc-commits] Contrib: use a simpler way to discriminate between libav and FFmpeg

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec 28 18:38:49 2013 +0100| [8f703b1502eddabfea9ba1ed470cfbfff97360f1] | committer: Jean-Baptiste Kempf

Contrib: use a simpler way to discriminate between libav and FFmpeg

(cherry picked from commit 4bed85170f0c40f48cf4b31c554e4b7a84e4cd71)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

Conflicts:
	contrib/src/ffmpeg/rules.mak

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

 contrib/src/ffmpeg/rules.mak |   24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index be66501..ada8107 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,10 +1,16 @@
 # FFmpeg
 
-#HASH=9aa053ceded5550b2e538578af383fd89d82364c
-#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
+#Uncomment the one you want
+#USE_LIBAV ?= 1
+#USE_FFMPEG ?= 1
 
+ifdef USE_FFMPEG
+HASH=9aa053ceded5550b2e538578af383fd89d82364c
+FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
+else
 HASH=b6a971994187e87fcc8811108e144f15c1652728
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
+endif
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
@@ -19,12 +25,16 @@ FFMPEGCONF = \
 	--disable-avfilter \
 	--disable-filters \
 	--disable-bsfs \
-	--disable-bzlib
+	--disable-bzlib \
+	--disable-programs \
+	--disable-avresample
+
+ifdef USE_FFMPEG
+FFMPEGCONF += \
+	--disable-swresample \
+	--disable-iconv
+endif
 
-# Those tools are named differently in FFmpeg and Libav
-#	--disable-ffserver \
-#	--disable-ffplay \
-#	--disable-ffprobe
 DEPS_ffmpeg = zlib gsm openjpeg
 
 # Optional dependencies