Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / Makefile

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 86518f6a58d2fef67048e95e3ebee2e96abeb162..c135eb867530074602f0c7acb12fbfdc0c91b81e 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -291,7 +291,8 @@ OBJS-$(CONFIG_SEGMENT_MUXER)             += segment.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += rawdec.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
 OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
-OBJS-$(CONFIG_SMJPEG_DEMUXER)            += smjpeg.o
+OBJS-$(CONFIG_SMJPEG_DEMUXER)            += smjpegdec.o smjpeg.o
+OBJS-$(CONFIG_SMJPEG_MUXER)              += smjpegenc.o smjpeg.o
 OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o pcm.o
 OBJS-$(CONFIG_SOX_DEMUXER)               += soxdec.o pcm.o
 OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o