Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 22:02:50 +0000 (00:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 22:02:54 +0000 (00:02 +0200)
commit917f86f47908ed9f6e11efe36ecfbe75dabe28c0
treeb2aeec3323b1a193f8a5c21e9e3b7ca25417e9b0
parentf09162c06bbafc4801c5a63a5abc6ce37d8881bd
parent79dd756e143a54efc25d64e90505f0dca6cbc4ec
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'

* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
  rtmpproto: Fix a typo

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