projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2ca3c04
7c65a76
)
Merge commit '7c65a76b16bc3a44f1592acde2176f187a058797'
author
James Almer
<jamrial@gmail.com>
Thu, 14 Dec 2017 21:46:10 +0000
(18:46 -0300)
committer
James Almer
<jamrial@gmail.com>
Thu, 14 Dec 2017 21:46:10 +0000
(18:46 -0300)
* commit '
7c65a76b16bc3a44f1592acde2176f187a058797
':
lavc/qsvenc: add error messeage if ICQ unsupported.
Merged-by: James Almer <jamrial@gmail.com>
1
2
libavcodec/qsvenc.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/qsvenc.c
Simple merge