Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:53:49 +0000 (11:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:53:54 +0000 (11:53 +0200)
* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6':
  rtpproto: Remove a misplaced comment

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

Simple merge