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:
802ba5f
4b1c9b7
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 16:48:15 +0000
(17:48 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 16:48:21 +0000
(17:48 +0100)
* cigaes/master:
lavc/srtenc: use bprint for text buffers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge