git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9a12fd
431c7bd
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 4 May 2014 16:24:21 +0000
(18:24 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 4 May 2014 16:30:06 +0000
(18:30 +0200)
* cehoyos/master:
Map --enable-lto to -ipo when compiling with icc.
Disable inline_asm_direct_symbol_refs if lto was requested.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge