Merge commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:56:36 +0000 (16:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:56:44 +0000 (16:56 +0200)
commitda32e3c3981983ba8cc40eb3041500ed4d1d7ff8
tree6fc159bb36e4aa048d851a3892b7c33d88124721
parent6e3830cca297996736784016a8bc908f8cb98cf3
parent0c5e6c542f5efffb4cd770e84967478b0076a6e5
Merge commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5' into release/1.1

* commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5':
  bytestream: add functions for accessing size of buffer

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