wrong construction of rtsp url in SETUP message

[daniel martinez]

the log trace:

11/22/11 10:08:40.124585 zmc_m10[13742].DB2-zm_rtsp.cpp/46 [Sending RTSP message: SETUP rtsp://192.168.101.141:554/live/rtsp://192.168.101.141/live:video:2 RTSP/1.0
Transport: RTP/AVP/TCP;unicast
User-Agent: ZoneMinder/1.24.2
CSeq: 2

]

The "SETUP" message is send with a malformed URL (rtsp://192.168.101.141:554/live/rtsp://192.168.101.141/live:video:2) the rtsp server expect just (rtsp://192.168.101.141:554/live)

I guess it is happening in zm_rtsp.cpp

    330
    331 U32 rtpClock = 0;
    332 std::string trackUrl = mUrl;
    333 if ( mFormatContext->nb_streams >= 1 )
    334 {
    335 for ( int i = 0; i < mFormatContext->nb_streams; i++ )
    336 {
    337 SessionDescriptor::MediaDescriptor *mediaDesc = sessDesc->getStream( i );
    338 if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
    339 {
    340 trackUrl += "/"+mediaDesc->getControlUrl();
    341 Debug( 1, "trackUrl '%s'", trackUrl.c_str() );
    342 rtpClock = mediaDesc->getClock();
    343 // Hackery pokery
    344 //rtpClock = mFormatContext->streams[i]->codec->sample_rate;
    345 break;
    346 }
    347 }
    348 }

The second part of the malformation URL seems to take part in line 340, where the control string "rtsp://192.168.101.141/live:video:2" is attached to the first rtsp URL "rtsp://192.168.101.141:554/live"