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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1805,6 +1805,7 @@ CONFIG_EXTRA=" h264qpel hpeldsp huffman + huffyuvdsp intrax8 lgplv3 llviddsp @@ -2059,7 +2060,7 @@ h263p_encoder_select="h263_encoder" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp" h264_decoder_suggest="error_resilience" hevc_decoder_select="cabac dsputil golomb videodsp" -huffyuv_decoder_select="dsputil llviddsp" +huffyuv_decoder_select="dsputil huffyuvdsp llviddsp" huffyuv_encoder_select="dsputil huffman llviddsp" iac_decoder_select="imc_decoder" imc_decoder_select="dsputil fft mdct sinewin" @@ -2068,7 +2069,7 @@ interplay_video_decoder_select="hpeldsp" jpegls_decoder_select="golomb mjpeg_decoder" jpegls_encoder_select="golomb" jv_decoder_select="dsputil" -lagarith_decoder_select="dsputil" +lagarith_decoder_select="huffyuvdsp" ljpeg_encoder_select="aandcttables mpegvideoenc" loco_decoder_select="golomb" mdec_decoder_select="dsputil error_resilience mpegvideo" @@ -2151,7 +2152,7 @@ tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" utvideo_encoder_select="dsputil huffman" -vble_decoder_select="dsputil" +vble_decoder_select="huffyuvdsp" vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" |