Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 08:39:37 +0000 (10:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 08:39:46 +0000 (10:39 +0200)
commitca1b02910889b44720d3937530c0f544c3a4aa2b
treece838027bb6f3fb1eaada2beaab3f300f64f899e
parentbff371e34ce2177ab8aaa74b71a7fbea500a786b
parentfd8f91e3f44a2bdbefaaebead388133c5fdd3423
Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'

* commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423':
  rtsp: Simplify code for forming the remote peer url

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