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)
* commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423':
  rtsp: Simplify code for forming the remote peer url

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

Simple merge