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)
* commit '1851e1d05d06f6ef3436c667e4354da0f407b226':
  rtpproto: Check the size before reading buf[1]

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

Simple merge