| 123456789101112131415161718192021222324252627282930 |
- From 7d549584baf9d3ed050643a98d688efa2a42d735 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Tue, 12 Jul 2016 13:50:54 +0200
- Subject: [PATCH 13/15] contrib/avcodec: enforce use of FFmpeg
- ---
- contrib/src/ffmpeg/rules.mak | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
- index 6604a76..607b781 100644
- --- a/contrib/src/ffmpeg/rules.mak
- +++ b/contrib/src/ffmpeg/rules.mak
- @@ -2,10 +2,10 @@
-
- #Uncomment the one you want
- #USE_LIBAV ?= 1
- -#USE_FFMPEG ?= 1
- +USE_FFMPEG ?= 1
-
- ifdef USE_FFMPEG
- -FFMPEG_HASH=HEAD
- +FFMPEG_HASH=9157ac2f
- FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
- FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
- else
- --
- 2.9.2
|
