OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e32b07a
6341ab0
)
Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 22 Jan 2015 21:51:40 +0000
(22:51 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 22 Jan 2015 21:52:01 +0000
(22:52 +0100)
* commit '
6341ab0ad3fde9583138e121f518e21cde15258e
':
libx265: Pass through user-set frame type
See:
41e983f1a63927dc0a2596cf2f0f7a946a048f11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge