Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Dec 2014 00:16:31 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Dec 2014 00:24:12 +0000 (01:24 +0100)
* commit '95d880fa6436f3b557a9c060428a04b9e4d552df':
  rtpproto: Fix the input RTP data format check

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

Simple merge