projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
03f22c2
fabfbfe
)
Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'
author
Clément Bœsch
<cboesch@gopro.com>
Thu, 30 Mar 2017 09:13:08 +0000
(11:13 +0200)
committer
Clément Bœsch
<cboesch@gopro.com>
Thu, 30 Mar 2017 09:13:08 +0000
(11:13 +0200)
* commit '
fabfbfe5710050812147f93a351a53fdda56ff8c
':
dxva2: fix surface selection when compiled with both d3d11va and dxva2
This commit is a noop, see
153b36fc62849e0e1540a43829794e0503994ebb
Merged-by: Clément Bœsch <cboesch@gopro.com>
Trivial merge