Skip to content

V
vlc-1.1
Commit cfeb72c0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Correct example RTP location (fixes #3901) 

(cherry picked from commit d350820bdecf153a9e1ea072c672f240b7114992)

Conflicts:

	modules/gui/qt4/ui/open_net.ui
parent a5a2f07b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/gui/qt4/ui/open_net.ui
View file @ cfeb72c0
......@@ -52,7 +52,7 @@
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">http://www.example.com/stream.avi</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">rtp://@1234</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">rtp://@:1234</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">mms://mms.examples.com/stream.asx</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">rtsp://server.example.org:8080/test.sdp</span></p>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;http://www.yourtube.com/watch?v=gg64x&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment