Merge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:02:10 +0000 (17:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:03:09 +0000 (17:03 +0200)
commitfab9a7be76eec79c1dab4974307628bbe00d3a46
tree17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7
parent3a67865963de4b0fcbfd201f8894f6c48d5ca9c1
parent7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a
Merge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2

* commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

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