Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
include filters in static ffmpeg build, fixes #3261
  • Loading branch information
mlauss2 authored and perexg committed Nov 4, 2015
1 parent 10ba670 commit be3bb7c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -66,6 +66,7 @@ LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib
LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a
LDFLAGS += ${LDFLAGS_FFDIR}/libswresample.a
LDFLAGS += ${LDFLAGS_FFDIR}/libavfilter.a
LDFLAGS += ${LDFLAGS_FFDIR}/libswscale.a
LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
LDFLAGS += ${LDFLAGS_FFDIR}/libavformat.a
LDFLAGS += ${LDFLAGS_FFDIR}/libavcodec.a
Expand Down
6 changes: 4 additions & 2 deletions Makefile.ffmpeg
Expand Up @@ -62,12 +62,13 @@ FFMPEG_URL = http://ffmpeg.org/releases/$(FFMPEG_TB)
FFMPEG_SHA1 = 95046cd9251b69c61b11ebcd1e163ac14d0fc2c6

EXTLIBS = libx264 libvorbis libvpx
COMPONENTS = avutil avformat avcodec swresample avfilter avresample
COMPONENTS = avutil avformat avcodec swresample swscale avfilter avresample
PROTOCOLS = file
DECODERS = mpeg2video mp2 ac3 eac3 h264 h264_vdpau hevc aac aac_latm vorbis libvorbis
ENCODERS = mpeg2video mp2 libx264 libvpx_vp8 libvpx_vp9 aac libaacplus vorbis libvorbis
MUXERS = mpegts mpeg2dvd matroska webm
BSFS = h264_mp4toannexb hevc_mp4toannexb
FILTERS = yadif scale

LIBOGG = libogg-1.3.2
LIBOGG_TB = $(LIBOGG).tar.gz
Expand Down Expand Up @@ -370,7 +371,8 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
$(foreach decoder,$(DECODERS),--enable-decoder=$(decoder)) \
$(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
$(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
$(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
$(foreach bsf,$(BSFS),--enable-bsf=$(bsf)) \
$(foreach filter,$(FILTERS),--enable-filter=$(filter))
DESTDIR=$(LIBAVDIR)/build \
$(MAKE) -C $(LIBAVDIR)/$(FFMPEG) install
@touch $@
Expand Down

0 comments on commit be3bb7c

Please sign in to comment.