diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:52:05 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:53:14 +0300 |
commit | 7871eb43616776626ec9f9075b6d0a8cf73d159e (patch) | |
tree | f9a88703414cd33e32c5f682974d8b4f96837b92 /configure | |
parent | 587980eb7a1f4b0228204aa846b72dc761e49779 (diff) | |
parent | 66acb76bb0492b263215ca9b4d927a7be39ace02 (diff) |
Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2214,6 +2214,7 @@ hap_decoder_select="snappy texturedsp" hap_encoder_deps="libsnappy" hap_encoder_select="texturedspenc" hevc_decoder_select="bswapdsp cabac golomb videodsp" +hevc_qsv_encoder_select="qsvenc" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" iac_decoder_select="imc_decoder" |