[vlc-commits] xspf: fix content-type matching (fixes #14576)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 20 19:39:20 2015 +0200| [468228005dbd3358d1e4b68c0187d24dda020ea6] | committer: Rémi Denis-Courmont

xspf: fix content-type matching (fixes #14576)

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

 modules/demux/playlist/xspf.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 0a7572b..703d311 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -84,8 +84,15 @@ static int Demux(demux_t *);
  */
 int Import_xspf(vlc_object_t *p_this)
 {
-    DEMUX_BY_EXTENSION_OR_MIMETYPE(".xspf", "application/xspf+xml",
-                                      "using XSPF playlist reader");
+    demux_t *p_demux = (demux_t *)p_this;
+
+    CHECK_FILE();
+
+    if( !demux_IsPathExtension( p_demux, ".xspf" )
+     && !demux_IsContentType( p_demux, "application/xspf+xml" ) )
+        return VLC_EGENERIC;
+
+    STANDARD_DEMUX_INIT_MSG("using XSPF playlist reader");
 
     return VLC_SUCCESS;
 }