summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-10-19 15:39:06 +0200
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-10-22 22:37:40 +0200
commitf524d2e47c055ce304d76bc87da9efb72e376eac (patch)
tree1a23f208333868e3a0c9a595860e2b88c9536647 /Makefile
parent0e8bfd3c934768f9812dd20d71fa4709de54186d (diff)
downloadffmpeg-f524d2e47c055ce304d76bc87da9efb72e376eac.tar.gz
ffserver: move configuration code to separate file
This commit doesn't change any existing logic. It moves ffserver configuration related code to separate file. It intends to make maintaining easier. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 57f6a91c47..1e1dbb3cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o
OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_vda.o
+OBJS-ffserver += ffserver_config.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options