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:
ce18e48
0d2fcdb
)
Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:00:13 +0000
(15:00 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:00:18 +0000
(15:00 +0100)
These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.
* commit '
0d2fcdb1c5c9e844c232e5429130727121990d0e
':
opt-test: Merge struct declaration and initialization
opt-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge