diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
| commit | 0a731e45964cda0606fc04128f41353d8282f091 (patch) | |
| tree | 652c5ac32280da901becae1c152ea73012bab921 /configure | |
| parent | d985976e54aec274d0c261091f77559d1a1bef84 (diff) | |
| parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) | |
| download | ffmpeg-0a731e45964cda0606fc04128f41353d8282f091.tar.gz | |
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
lavc: add Intel libmfx-based H.264 encoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1892,6 +1892,7 @@ CONFIG_EXTRA=" qpeldsp qsv qsvdec + qsvenc rangecoder riffdec riffenc @@ -2075,6 +2076,7 @@ mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp videodsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" qsvdec_select="qsv" +qsvenc_select="qsv" # decoders / encoders aac_decoder_select="imdct15 mdct sinewin" @@ -2150,6 +2152,8 @@ h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode h264_decoder_suggest="error_resilience" h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" +h264_qsv_encoder_deps="libmfx" +h264_qsv_encoder_select="qsvenc" hevc_decoder_select="bswapdsp cabac golomb videodsp" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" |