Commit c33aef8b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

contrib: build gsm only if ffmpeg is built

parent 15228fd3
......@@ -5,9 +5,11 @@ FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN_REV=26400
FFMPEGCONF = --cc="$(CC)" \
FFMPEGCONF = \
--cc="$(CC)" \
--disable-doc \
--disable-decoder=libvpx \
--enable-gsm \
--disable-debug \
--enable-gpl \
--enable-postproc \
......@@ -19,7 +21,7 @@ FFMPEGCONF = --cc="$(CC)" \
--disable-protocols \
--disable-avfilter \
--disable-network
DEPS_ffmpeg = zlib
DEPS_ffmpeg = zlib gsm
# Optional dependencies
ifdef BUILD_ENCODERS
......@@ -31,9 +33,6 @@ FFMPEGCONF += --disable-encoders --disable-muxers
# XXX: REVISIT --enable-small ?
endif
#FFMPEGCONF += --enable-libgsm
#DEPS_ffmpeg += gsm $(DEPS_gsm)
#FFMPEGCONF += --enable-libvpx
#DEPS_ffmpeg += vpx $(DEPS_vpx)
......
......@@ -2,8 +2,6 @@
GSM_VERSION := 1.0.12
GSM_URL := $(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz
PKGS += gsm
$(TARBALLS)/gsm-$(GSM_VERSION).tar.gz:
$(call download,$(GSM_URL))
......
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