summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-06-30 05:37:59 -0700
committerDiego Biurrun <diego@biurrun.de>2014-06-30 07:53:40 -0700
commitadcb8392c9b185fd8a91a95fa256d15ab1432a30 (patch)
tree5eca7eb4c26b7fa5d564e4fb357e2aadf7d55c88 /libavcodec/Makefile
parent253d0be6a1ecc343d29ff8e1df0ddf961ab9c772 (diff)
mjpeg: Split off bits shared by MJPEG and LJPEG encoders
This obviates a dependency of the LJPEG encoder on mpegvideo.
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1881b0b963..bfe50f352e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -233,7 +233,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o
OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o
OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
OBJS-$(CONFIG_LAGARITH_DECODER) += lagarith.o lagarithrac.o
-OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o
+OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpeg.o mjpegenc_common.o
OBJS-$(CONFIG_LOCO_DECODER) += loco.o
OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_DECODER) += mace.o
@@ -242,7 +242,7 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
twinvq.o
OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o
+OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mjpegenc_common.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o