Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / Makefile

diff --git a/ffmpeg/Makefile b/ffmpeg/Makefile
index 57f6a91c477115f63ba388a445653da108d0cf03..1e1dbb3cd41ae2239f89ca31a510e1668a8c6f02 100644 (file)
--- a/ffmpeg/Makefile
+++ b/ffmpeg/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