Skip to content

V
vlc-2-2
Commit 4bed8517 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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

parent 42bf7e20
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 7 deletions
contrib/src/ffmpeg/rules.mak
View file @ 4bed8517
# FFmpeg # FFmpeg
HASH=HEAD #Uncomment the one you want
#USE_LIBAV ?= 1
#USE_FFMPEG ?= 1
#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz ifdef USE_FFMPEG
HASH=HEAD
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
else
HASH=HEAD
FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
endif
FFMPEGCONF = \ FFMPEGCONF = \
--cc="$(CC)" \ --cc="$(CC)" \
...@@ -18,12 +25,16 @@ FFMPEGCONF = \ ...@@ -18,12 +25,16 @@ FFMPEGCONF = \
--disable-avfilter \ --disable-avfilter \
--disable-filters \ --disable-filters \
--disable-bsfs \ --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 DEPS_ffmpeg = zlib gsm openjpeg
# Optional dependencies # Optional dependencies
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment