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)
* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2':
  rtmppkt: Add a descriptive comment

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

Simple merge