[vlc-commits] playlist: asf: add wax mime type

Francois Cartegnie git at videolan.org
Sat May 10 17:01:23 CEST 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May  8 00:02:49 2014 +0200| [5b7b2a5ed8dc2821b368f7ed56a8b4bfb7af973a] | committer: Francois Cartegnie

playlist: asf: add wax mime type

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

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

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index e09cf48..79a841d 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -153,7 +153,8 @@ int Import_ASX( vlc_object_t *p_this )
         demux_IsPathExtension( p_demux, ".wax" ) ||
         demux_IsPathExtension( p_demux, ".wvx" ) ||
         (
-          CheckContentType( p_demux->s, "video/x-ms-asf" ) && PeekASX( p_demux )
+          ( CheckContentType( p_demux->s, "video/x-ms-asf" ) ||
+            CheckContentType( p_demux->s, "audio/x-ms-wax" ) ) && PeekASX( p_demux )
         ) ||
         demux_IsForced( p_demux, "asx-open" ) )
     {



More information about the vlc-commits mailing list