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)
commit27897d2ef6d3a267bf1d9417f8b43bee8ba710a9
treefc6aee10d95db36a5959754045b654d482eff739
parentcb58c771ade66afcc623250e1c7ac8191381d991
parent491805636cef50d3f582bd345e1460eeb739ea48
Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'

* commit '491805636cef50d3f582bd345e1460eeb739ea48':
  rtmpproto: Fix a typo in a comment

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