projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
841e9f4
)
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:16 +0000
(21:12 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:19 +0000
(21:12 +0100)
* commit '
11c22dfd495bbd3f38df639772aa4bb9a1be882d
':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
10d3cf6
..
2696cb2
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-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"