diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-27 19:25:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-27 19:30:19 +0200 |
| commit | c4b269c5c6ea67a23155951321dea387a50896dc (patch) | |
| tree | 700fb29f1c609f4818e3b3b1386444230287584d /libavcodec | |
| parent | e6aed5f404a0983b2971c90e9022f6964a75de0b (diff) | |
| download | ffmpeg-c4b269c5c6ea67a23155951321dea387a50896dc.tar.gz | |
build system: enable j2kenc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a601fb09d..2aa0ffc3eb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -200,7 +200,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_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o j2k_dwt.o -#OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o +OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ mjpegdec.o mjpeg.o OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 0fcf857e5c..72a32c444c 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -131,7 +131,7 @@ void avcodec_register_all(void) REGISTER_DECODER (INDEO3, indeo3); REGISTER_DECODER (INDEO5, indeo5); REGISTER_DECODER (INTERPLAY_VIDEO, interplay_video); - REGISTER_DECODER (JPEG2000, jpeg2000); + REGISTER_ENCDEC (JPEG2000, jpeg2000); REGISTER_ENCDEC (JPEGLS, jpegls); REGISTER_DECODER (JV, jv); REGISTER_DECODER (KGV1, kgv1); |