[vlc-commits] PLS: replace HTTP in Ref1 with MMSH rather than MMS (fixes #4494)

Rémi Denis-Courmont git at videolan.org
Sun Feb 13 16:49:57 CET 2011


vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 13 17:47:44 2011 +0200| [338246213aa324a9accf4950bc95e081689c60b5] | committer: Rémi Denis-Courmont

PLS: replace HTTP in Ref1 with MMSH rather than MMS (fixes #4494)

If the playlist file says HTTP, we really should not try MMS over TCP
or MMS over UDP, but only MMS over HTTP.
(cherry picked from commit f0c3d6fb0b9c33b06753cf60c724ee1c3fd2dd40)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=338246213aa324a9accf4950bc95e081689c60b5
---

 modules/demux/playlist/pls.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 20a6f52..6925cc0 100644
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -169,12 +169,7 @@ static int Demux( demux_t *p_demux )
             if( !strncasecmp( psz_key, "Ref", sizeof("Ref") -1 ) )
             {
                 if( !strncasecmp( psz_mrl, "http://", sizeof("http://") -1 ) )
-                {
-                    psz_mrl++;
-                    psz_mrl[0] = 'm';
-                    psz_mrl[1] = 'm';
-                    psz_mrl[2] = 's';
-                }
+                    memcpy( psz_mrl, "mmsh", 4 );
             }
         }
         else if( !strncasecmp( psz_key, "title", sizeof("title") -1 ) )



More information about the vlc-commits mailing list