diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:16:21 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:16:21 +0300 |
commit | b12eacb3837cad2daaeda1f77ceb1045bca68789 (patch) | |
tree | 10428214a95fd2fce6c115ebf0dac9c709d35b4f /configure | |
parent | 151ae8ea5b54e12da6d53fa96d67026371e760ea (diff) | |
parent | d0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff) |
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
qsvdec: split off some code that will be shared with the encoder
Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1890,6 +1890,7 @@ CONFIG_EXTRA=" nettle pixblockdsp qpeldsp + qsv qsvdec rangecoder riffdec @@ -2073,6 +2074,7 @@ mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp videodsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" +qsvdec_select="qsv" # decoders / encoders aac_decoder_select="imdct15 mdct sinewin" |