Commit ababf119 authored by Rafaël Carré's avatar Rafaël Carré

contrib: ffmpeg: only use libvpx when building encoders

parent 51bad0ef
...@@ -8,7 +8,6 @@ FFMPEGCONF = \ ...@@ -8,7 +8,6 @@ FFMPEGCONF = \
--disable-doc \ --disable-doc \
--disable-decoder=libvpx \ --disable-decoder=libvpx \
--enable-libgsm \ --enable-libgsm \
--enable-libvpx \
--enable-libopenjpeg \ --enable-libopenjpeg \
--disable-debug \ --disable-debug \
--enable-gpl \ --enable-gpl \
...@@ -22,12 +21,12 @@ FFMPEGCONF = \ ...@@ -22,12 +21,12 @@ FFMPEGCONF = \
--disable-protocols \ --disable-protocols \
--disable-avfilter \ --disable-avfilter \
--disable-network --disable-network
DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) openjpeg DEPS_ffmpeg = zlib gsm openjpeg
# Optional dependencies # Optional dependencies
ifdef BUILD_ENCODERS ifdef BUILD_ENCODERS
FFMPEGCONF += --enable-libmp3lame FFMPEGCONF += --enable-libmp3lame --enable-libvpx
DEPS_ffmpeg += lame $(DEPS_lame) DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
else else
FFMPEGCONF += --disable-encoders --disable-muxers FFMPEGCONF += --disable-encoders --disable-muxers
# XXX: REVISIT --enable-small ? # XXX: REVISIT --enable-small ?
......
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