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:
4a59994
4c41a7a
)
Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 4 Mar 2014 21:01:24 +0000
(22:01 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 4 Mar 2014 21:01:24 +0000
(22:01 +0100)
* commit '
4c41a7a1798dd6c60e40f79be12faa98a9347151
':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge