diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
| commit | 48a691630833d6b12905475b6bf39fef285872a9 (patch) | |
| tree | aaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7 /configure | |
| parent | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff) | |
| parent | 512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff) | |
| download | ffmpeg-48a691630833d6b12905475b6bf39fef285872a9.tar.gz | |
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
dsputil: Split off HuffYUV encoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_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
@@ -1806,6 +1806,7 @@ CONFIG_EXTRA=" hpeldsp huffman huffyuvdsp + huffyuvencdsp intrax8 lgplv3 llviddsp @@ -2061,7 +2062,7 @@ 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 huffyuvdsp llviddsp" -huffyuv_encoder_select="dsputil huffman llviddsp" +huffyuv_encoder_select="dsputil huffman huffyuvencdsp llviddsp" iac_decoder_select="imc_decoder" imc_decoder_select="dsputil fft mdct sinewin" indeo3_decoder_select="hpeldsp" @@ -2113,7 +2114,7 @@ nuv_decoder_select="dsputil lzo" on2avc_decoder_select="mdct" opus_decoder_deps="swresample" png_decoder_select="zlib" -png_encoder_select="dsputil zlib" +png_encoder_select="huffyuvencdsp zlib" prores_decoder_select="dsputil" prores_encoder_select="dsputil" qcelp_decoder_select="lsp" @@ -2151,7 +2152,7 @@ truespeech_decoder_select="dsputil" tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" -utvideo_encoder_select="dsputil huffman" +utvideo_encoder_select="dsputil huffman huffyuvencdsp" vble_decoder_select="huffyuvdsp" vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8" vc1image_decoder_select="vc1_decoder" |