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)
commita105c1f204bd820246a18b6af6d85f5a4839e000
tree179e89b16ba3dec2d17561fd5e806e7b279d7af5
parentea38e5a6b75706477898eb1e6582d667dbb9946c
parent857e6667f9061ae261c0b951113e4efc4329b05e
Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'

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

Conflicts:
libavformat/rtmpproto.c

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