diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:03:23 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:03:23 +0300 |
| commit | 151ae8ea5b54e12da6d53fa96d67026371e760ea (patch) | |
| tree | 892d2bff27e97e165819d75ebe0d6bb0872a295c /configure | |
| parent | 4ae7c3709958da7e0bd17cfebf1c947a84594c53 (diff) | |
| parent | b04d009b0e1a34b717f3d3bbf407aef0c742aff1 (diff) | |
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
qsv: rename to qsvdec
Conflicts:
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
@@ -1890,7 +1890,7 @@ CONFIG_EXTRA=" nettle pixblockdsp qpeldsp - qsv + qsvdec rangecoder riffdec riffenc @@ -2147,7 +2147,7 @@ h263p_encoder_select="h263_encoder" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp" h264_decoder_suggest="error_resilience" h264_qsv_decoder_deps="libmfx" -h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsv h264_qsv_hwaccel" +h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" hevc_decoder_select="bswapdsp cabac golomb videodsp" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" |