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)
* cigaes/master:
  lavc/srtenc: use bprint for text buffers.

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

Trivial merge