diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
| commit | ab8d9fe9b84c92b21354a7e5df3b61a28477f576 (patch) | |
| tree | 9bb438dc1e4d65df4f20bd0fce15ed3f3126c956 /configure | |
| parent | bce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4 (diff) | |
| parent | 8ef33497a6a3ed05d2f931809c074ef3d1878834 (diff) | |
| download | ffmpeg-ab8d9fe9b84c92b21354a7e5df3b61a28477f576.tar.gz | |
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
build: Add config option for CABAC code
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1752,6 +1752,7 @@ CONFIG_EXTRA=" aandcttables ac3dsp audio_frame_queue + cabac dsputil exif frame_thread_encoder @@ -2013,9 +2014,9 @@ h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo" h263_encoder_select="aandcttables h263dsp mpegvideoenc" h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" -h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" +h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp" h264_decoder_suggest="error_resilience" -hevc_decoder_select="dsputil golomb videodsp" +hevc_decoder_select="cabac dsputil golomb videodsp" huffyuv_decoder_select="dsputil llviddsp" huffyuv_encoder_select="dsputil huffman llviddsp" iac_decoder_select="imc_decoder" |