Commit 6d2cf9f3 authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

contrib: Only use options common to Libav and FFmpeg

(cherry picked from commit 0accbd79)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3d4f924e
...@@ -12,15 +12,17 @@ FFMPEGCONF = \ ...@@ -12,15 +12,17 @@ FFMPEGCONF = \
--disable-debug \ --disable-debug \
--enable-gpl \ --enable-gpl \
--enable-postproc \ --enable-postproc \
--disable-ffprobe \
--disable-ffserver \
--disable-ffmpeg \ --disable-ffmpeg \
--disable-ffplay \
--disable-avconv \ --disable-avconv \
--disable-devices \ --disable-devices \
--disable-protocols \ --disable-protocols \
--disable-avfilter \ --disable-avfilter \
--disable-network --disable-network
# 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