projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f277e1
29a8ed7
)
Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'
author
James Almer
<jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:47 +0000
(19:58 -0300)
committer
James Almer
<jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:47 +0000
(19:58 -0300)
* commit '
29a8ed766354c45c9be4b8512c5b2eb25a450cdc
':
lavf/qsvvpp: bypass vpp if not needed.
Merged-by: James Almer <jamrial@gmail.com>
1
2
libavfilter/vf_vpp_qsv.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavfilter/vf_vpp_qsv.c
Simple merge