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:
8720d3a
779e6c2
)
Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 27 Jul 2013 06:52:30 +0000
(08:52 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 27 Jul 2013 06:53:09 +0000
(08:53 +0200)
* commit '
779e6c2b985f2ad461a1ae704160822f97709ba7
':
lavfi: add attribute_align_arg to all public entry points
Conflicts:
libavfilter/buffersink.c
See:
af2a196e669cf7f00735a1df5889db35f3be87eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge