Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 21:01:38 +0000 (22:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 21:01:45 +0000 (22:01 +0100)
* commit '491805636cef50d3f582bd345e1460eeb739ea48':
  rtmpproto: Fix a typo in a comment

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

Simple merge