diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 11:49:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 11:49:48 +0200 |
| commit | 35cf069aeababf85da5b5b81f72e65268a4a1920 (patch) | |
| tree | 97ea08ce64314a61d8474d04b4ee8ed17dded346 /libavcodec | |
| parent | dc60061bb6e3b2ee87a12fb3a26239d7b5a74379 (diff) | |
| parent | f1c8413dc7db6749029c3be7f5933e20c965c2e3 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --disable-everything --enable-encoder=jpeg2000
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 676e68e843..7d5d2d9235 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -243,7 +243,8 @@ OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o 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 +OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o jpeg2000.o \ + jpeg2000dwt.o OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o \ jpeg2000dwt.o mqcdec.o mqc.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ |