diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 23:07:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 23:16:06 +0200 |
| commit | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (patch) | |
| tree | 536e4539c573752b2b446d2c8ef17d9d62927815 /libavcodec/Makefile | |
| parent | 43c57dbe14545d13dbfd8aae341b45514e8bcfbb (diff) | |
| parent | 0d439fbede03854eac8a978cccf21a3425a3c82d (diff) | |
| download | ffmpeg-e2abc0d5cacc22aa900de8ac26160ea1b786a7b5.tar.gz | |
Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
dsputil: Split off HuffYUV decoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/lagarith.c
libavcodec/vble.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7b0b99f470..e614268e70 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -54,6 +54,7 @@ OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o +OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LLVIDDSP) += lossless_videodsp.o |