[vlc-commits] shoutcast: force demux via option rather than MRL

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun  3 22:38:22 2017 +0300| [454aaef32523d311b279f891eee70558d266b96e] | committer: Rémi Denis-Courmont

shoutcast: force demux via option rather than MRL

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=454aaef32523d311b279f891eee70558d266b96e
---

 modules/demux/playlist/shoutcast.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index d4c7cee68c..2796bc75b0 100644
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -38,7 +38,7 @@
 #include <vlc_strings.h>
 
 /* duplicate from modules/services_discovery/shout.c */
-#define SHOUTCAST_BASE_URL "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml"
+#define SHOUTCAST_BASE_URL "http://www.shoutcast.com/sbin/newxml.phtml"
 #define SHOUTCAST_TUNEIN_BASE_URL "http://www.shoutcast.com"
 #define SHOUTCAST_TV_TUNEIN_URL "http://www.shoutcast.com/sbin/tunein-tvstation.pls?id="
 
@@ -173,6 +173,7 @@ static int DemuxGenre( demux_t *p_demux, xml_reader_t *p_xml_reader,
                         vlc_xml_decode( psz_mrl );
                         p_input = input_item_New( psz_mrl, psz_name );
                         input_item_CopyOptions( p_input, p_input_node->p_item );
+                        input_item_AddOption( p_input, "demux=shout-winamp", VLC_INPUT_OPTION_TRUSTED );
                         free( psz_mrl );
                         input_item_node_AppendItem( p_input_node, p_input );
                         input_item_Release( p_input );