Merge commit '324b23dde1bc8638959eb32419c95a93906db272'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 13:21:26 +0000 (15:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 13:21:40 +0000 (15:21 +0200)
commit6cf9d02cea5e9ebc46ae037eb003a9353a38f5b1
tree9f8f4cd0d93553bd4a758f33bdd03b35d97880aa
parent1eda312aca278c81fea9f0f67413b3ee9f386b4a
parent324b23dde1bc8638959eb32419c95a93906db272
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'

* commit '324b23dde1bc8638959eb32419c95a93906db272':
  rtmpproto: Add function to read a number response

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c