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:
ee865e9
4c6836d
)
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:27:18 +0000
(23:27 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:27:22 +0000
(23:27 +0100)
This commit is a no-op.
* commit '
4c6836db0f300d2c0401c6a1927a95c3258cc1ae
':
nvenc_h264: Fix name of private AVClass
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge