Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:24:53 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:24:57 +0000 (13:24 +0200)
commit2ee58af53e1cb788f9b8d50530ec1f5f73c431b6
treee48e934ea23507d907e7bef90c27ee80da1d19f2
parent4f07fcd30b0e910d11e08172549a301beffd7e3a
parent1851e1d05d06f6ef3436c667e4354da0f407b226
Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'

* commit '1851e1d05d06f6ef3436c667e4354da0f407b226':
  rtpproto: Check the size before reading buf[1]

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