projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d693392
1e9c5bf
)
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
author
Matthieu Bouron
<matthieu.bouron@stupeflix.com>
Mon, 27 Jun 2016 15:18:25 +0000
(17:18 +0200)
committer
Matthieu Bouron
<matthieu.bouron@stupeflix.com>
Mon, 27 Jun 2016 15:18:25 +0000
(17:18 +0200)
* commit '
1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e
':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Trivial merge