diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 19:41:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 20:00:54 +0200 |
| commit | e2e9bee2daef9d5d5169f5360737eec8b76d7e0c (patch) | |
| tree | 22ba6e50d34a036832d4ef8f903df335d3c9d63a /libavcodec/Makefile | |
| parent | c1c2b0b3390482bba39534f2f125d97e8964d7d5 (diff) | |
| parent | f13888afcc5e528b80e4ae5bc4f0d9dadc76f6aa (diff) | |
| download | ffmpeg-e2e9bee2daef9d5d5169f5360737eec8b76d7e0c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8ffb44eccf..6f986498a7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -244,6 +244,8 @@ 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 j2k.o j2k_dwt.o OBJS-$(CONFIG_J2K_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o +OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o \ + jpeg2000dwt.o mqcdec.o mqc.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ mjpegdec.o mjpeg.o OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o |