Merge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:14:47 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:15:44 +0000 (12:15 +0100)
commit5ab467043a2b4df10e2731d3ac9ba39039386228
treeef0d490cdefbb3495220c7ebc7e3de2c9e0b7ca7
parent3f24dacf810e214440d691dcbc7231905c736ebb
parent29bc7bfba288ff8572ed967a8752a1dbde7b724b
Merge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'

* commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b':
  rtpproto: Write a warning if the input data written isn't RTP packetized

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