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)
commitb39f012dee7aac577b43c51a7119955e7509a72b
tree2b3c4bbfe550ff54d2e5792802e98bcd6235ad06
parentd2c613dd1460a34ca166550d5d9d8cdd5cf278df
parent7531588fffbca1f0afdcc06635999c00dfc16ca6
Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'

* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6':
  rtpproto: Remove a misplaced comment

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