diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:12:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:12:19 +0100 |
commit | ac649bb775b9635db6810cb200ef81a777368e4a (patch) | |
tree | 05011139598044ec9a794b4b60014471d7fa3cc2 | |
parent | 841e9f431cf4b1be0b5c3932c289d405f34dfcc2 (diff) | |
parent | 11c22dfd495bbd3f38df639772aa4bb9a1be882d (diff) | |
download | ffmpeg-ac649bb775b9635db6810cb200ef81a777368e4a.tar.gz |
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2289,6 +2289,7 @@ h263_vdpau_hwaccel_select="h263_decoder" h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_select="h264_decoder" +h264_qsv_hwaccel_deps="libmfx" h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_select="h264_decoder" h264_vda_decoder_deps="vda" |