diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 02:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:08 +0200 |
| commit | 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba (patch) | |
| tree | 90555a38c78062885be162271998559c64fe80ff /libavcodec/Makefile | |
| parent | fd7e1190379db1b2b3eaa31c00dc9c92803faef3 (diff) | |
| download | ffmpeg-9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba.tar.gz | |
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fcbca23d3a..676e68e843 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -243,8 +243,7 @@ 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_J2K_DECODER) += j2kdec.o mqcdec.o mqc.o jpeg2000.o -OBJS-$(CONFIG_J2K_ENCODER) += j2kenc.o mqcenc.o mqc.o jpeg2000.o +OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o jpeg2000.o OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o \ jpeg2000dwt.o mqcdec.o mqc.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ |