aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorJerry Jiang <jerryjiang1128@gmail.com>2017-02-01 23:23:04 -0800
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-02-08 13:59:53 +0000
commit884506dfe2e29a5b2bd2905ca4f17e277e32acb1 (patch)
treeefac020fcd29af2670ddbf40faff5edb5ddf718e /libavcodec/Makefile
parent2d453188c2303da641dafb048dc1806790526dfd (diff)
downloadffmpeg-884506dfe2e29a5b2bd2905ca4f17e277e32acb1.tar.gz
Implement optimal huffman encoding for (M)JPEG.
> seems to break > make fate-vsynth1-mjpeg-444 Fixed.
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 43a6add317..4765e9c96c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -39,6 +39,7 @@ OBJS = allcodecs.o \
mediacodec.o \
mpeg12framerate.o \
options.o \
+ mjpegenc_huffman.o \
parser.o \
profiles.o \
qsv_api.o \
@@ -175,7 +176,8 @@ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
celp_math.o acelp_filters.o \
acelp_vectors.o \
acelp_pitch_delay.o
-OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpegenc_common.o
+OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpegenc_common.o \
+ mjpegenc_huffman.o
OBJS-$(CONFIG_ANM_DECODER) += anm.o
OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER) += apedec.o
@@ -377,7 +379,8 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o
OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o
-OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o
+OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o \
+ mjpegenc_huffman.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o
OBJS-$(CONFIG_MJPEG_VAAPI_ENCODER) += vaapi_encode_mjpeg.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
@@ -1014,6 +1017,7 @@ TESTPROGS = avpacket \
jpeg2000dwt \
mathops \
options \
+ mjpegenc_huffman \
utils \
TESTPROGS-$(CONFIG_CABAC) += cabac