[FFmpeg-cvslog] Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  2 10:39:37 2013 +0200| [ca1b02910889b44720d3937530c0f544c3a4aa2b] | committer: Michael Niedermayer

Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca1b02910889b44720d3937530c0f544c3a4aa2b
---