Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 10:35:08 +0000 (11:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 10:35:08 +0000 (11:35 +0100)
* commit '857e6667f9061ae261c0b951113e4efc4329b05e':
  rtmpproto: Clarify a comment

Conflicts:
libavformat/rtmpproto.c

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

Simple merge