contribs: Make sure either USE_FFMPEG or USE_LIBAV is set
authorMartin Storsjö <martin@martin.st>
Thu, 28 Dec 2017 20:58:28 +0000 (22:58 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 2 Jan 2018 22:18:54 +0000 (23:18 +0100)
The rest of rules.mak assumes that either of them is set (and check
either "ifdef USE_FFMPEG" or "ifdef USE_LIBAV"), but by default
neither is set. If using the "ifndef USE_LIBAV" branch and fetching
sources from ffmpeg, make sure USE_FFMPEG is set in the rest of the
makefile.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
contrib/src/ffmpeg/rules.mak

index d88cefd..b9f8fc8 100644 (file)
@@ -9,6 +9,7 @@ FFMPEG_HASH=eaff5fcb7cde8d1614755269773d471d3a3d1bfc
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
 FFMPEG_LAVC_MIN := 57.37.100
+USE_FFMPEG := 1
 else
 FFMPEG_HASH=e171022c24c42b1e88a51bb3b4c27f13c87c85cb
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz