summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYusuke Nakamura <muken.the.vfrmaniac@gmail.com>2014-10-02 12:53:44 -0300
committerJames Almer <jamrial@gmail.com>2014-10-02 12:56:13 -0300
commit6ea357ea83e3a821c43e05a324f7bcaa3d73076e (patch)
tree4b3ae1dae7b0c92e17a9ee03f038c40688b3de9d
parent23c9ebffb5e2e9a525d19a8b9c31879ec7012fc9 (diff)
Fix compilation of jpeg2000dsp when disabling the encoder.
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 04a7944c79..f27ba306a6 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -275,8 +275,8 @@ OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o
OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o jpeg2000.o \
- jpeg2000dwt.o jpeg2000dsp.o
-OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o \
+ jpeg2000dwt.o
+OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o jpeg2000dsp.o \
jpeg2000dwt.o mqcdec.o mqc.o
OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o
OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o