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)
commit0f5a40c2a4bc2ae6548d75b9a9f3ef568e995883
tree7d0489831e464cd9405683fa4a27a58febfd8c29
parent2ee58af53e1cb788f9b8d50530ec1f5f73c431b6
parentee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2
Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'

* commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2':
  rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

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