[vlc-commits] contribs: Make sure either USE_FFMPEG or USE_LIBAV is set

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 28 22:58:28 2017 +0200| [9eca5cd672e85a1d64c31ccb95914203de8c0f8e] | committer: Jean-Baptiste Kempf

contribs: Make sure either USE_FFMPEG or USE_LIBAV is set

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 at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9eca5cd672e85a1d64c31ccb95914203de8c0f8e
---

 contrib/src/ffmpeg/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d88cefd5b4..b9f8fc86f1 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -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