diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:37:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:37:38 +0100 |
| commit | 80793afb177ebfbc2d68327d2ca0380acc734cba (patch) | |
| tree | 771c50d689ebf0f963084d6a1f97da85b5cef6ae /configure | |
| parent | 11146a9b440cd616b3a5ab322cfcca95da2aec7f (diff) | |
| parent | 2f02bbcca050936686482453078e83dc25493da0 (diff) | |
Merge commit '2f02bbcca050936686482453078e83dc25493da0'
* commit '2f02bbcca050936686482453078e83dc25493da0':
build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1924,8 +1924,8 @@ eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="dsputil golomb rangecoder" ffv1_encoder_select="dsputil rangecoder" -ffvhuff_decoder_select="dsputil llviddsp" -ffvhuff_encoder_select="dsputil huffman llviddsp" +ffvhuff_decoder_select="huffyuv_decoder" +ffvhuff_encoder_select="huffyuv_encoder" fic_decoder_select="dsputil golomb" flac_decoder_select="golomb" flac_encoder_select="dsputil golomb lpc" |