OSDN Git Service

Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 16:48:15 +0000 (17:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 16:48:21 +0000 (17:48 +0100)
commit98a6578468ddd6c83ecbcfad52b9528e90251ce6
treef1fa0b9c5eaa0b900320abc416fe98d233509413
parent802ba5f5575716a644d693d2e101ddadee509ea6
parent4b1c9b720e11d200ca7090210b34c409f43fafeb
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc/srtenc: use bprint for text buffers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>