[FFmpeg-cvslog] Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 28 11:35:08 2014 +0100| [a105c1f204bd820246a18b6af6d85f5a4839e000] | committer: Michael Niedermayer

Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'

* commit '857e6667f9061ae261c0b951113e4efc4329b05e':
  rtmpproto: Clarify a comment

Conflicts:
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a105c1f204bd820246a18b6af6d85f5a4839e000
---