diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-31 17:39:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-31 17:42:12 -0300 |
| commit | 678ab33861d1061d2b730ffccccab188c22faadd (patch) | |
| tree | 69d0969da63ebddfee486e54521ab14a2c9e44de /configure | |
| parent | 99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc (diff) | |
| parent | b6582b29277e00e5d49f400e58beefa5a21d83b8 (diff) | |
| download | ffmpeg-678ab33861d1061d2b730ffccccab188c22faadd.tar.gz | |
Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
qsv: Add VC-1 decoder
See fb57bc6c34b979bec995e714162fdfb4caf6db1a.
Merged for cosmetic purposes to reduce differences with libav.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2550,7 +2550,7 @@ utvideo_encoder_select="bswapdsp huffman llvidencdsp" vble_decoder_select="llviddsp" vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo vc1dsp" vc1_qsv_decoder_deps="libmfx" -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel" +vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" |