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:
527f89e
2a2889e
)
Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'
author
Clément Bœsch
<cboesch@gopro.com>
Fri, 5 May 2017 11:43:18 +0000
(13:43 +0200)
committer
Clément Bœsch
<cboesch@gopro.com>
Fri, 5 May 2017 11:43:18 +0000
(13:43 +0200)
* commit '
2a2889e130fee6d3c11e506328388afb317626ed
':
build: Remove stray duplicate conditional variable declaration
This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36edcd05b53a56ee359d9559cc4e11597
)
Merged-by: Clément Bœsch <cboesch@gopro.com>
Trivial merge