ffmpeg | branch: master | Yusuke Nakamura <muken.the.vfrmaniac at gmail.com> | Thu Oct 2 12:53:44 2014 -0300| [6ea357ea83e3a821c43e05a324f7bcaa3d73076e] | committer: James Almer
Fix compilation of jpeg2000dsp when disabling the encoder.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ea357ea83e3a821c43e05a324f7bcaa3d73076e
---
libavcodec/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 04a7944..f27ba30 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