Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:51:37 +0000 (13:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:51:44 +0000 (13:51 +0200)
* commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2':
  rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

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

Simple merge