projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59b1942
b91ce48
)
Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'
author
Mark Thompson
<sw@jkqxz.net>
Thu, 30 Mar 2017 20:16:58 +0000
(21:16 +0100)
committer
Mark Thompson
<sw@jkqxz.net>
Thu, 30 Mar 2017 20:16:58 +0000
(21:16 +0100)
* commit '
b91ce4860054430d3712deb0d9487cac2fcb7d68
':
hwcontext_qsv: do not fail when download/upload VPP session creation fails
Merged-by: Mark Thompson <sw@jkqxz.net>
1
2
libavutil/hwcontext_qsv.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavutil/hwcontext_qsv.c
Simple merge