Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:58:39 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:58:43 +0000 (12:58 +0100)
commit94ec27131c7aa4b1a6b2b4830d3c92b02fb5104d
tree3c229b654f42e9efe2f6fac645e1c27a9823c0c4
parentd540e7577a4cfdb166d0287b619c30969ca749b4
parent48cfb5f4114048383a4ee85b2f500eefce24cad2
Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'

* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2':
  rtmppkt: Add a descriptive comment

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