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:
d9a4db6
71f2941
)
Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 00:34:28 +0000
(
01:34
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 00:34:55 +0000
(
01:34
+0100)
* commit '
71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06
':
lavfi: Increase drawtext font size limits
Conflicts:
libavfilter/vf_drawtext.c
See:
b87d4c2b9f4106045afeabe1f1338c3eddb66935
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge