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)
* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
  rtmpproto: Fix a typo

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

Simple merge