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

Jean-Baptiste Kempf git at videolan.org
Fri Apr 10 10:33:18 CEST 2015


vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 10 10:27:34 2015 +0200| [70ae08e460fc2d4578fa954ffdca0244631865f0] | committer: Jean-Baptiste Kempf

Revert "playlist: asf: add wax mime type"

This reverts commit 5b7b2a5ed8dc2821b368f7ed56a8b4bfb7af973a.

Ref #14062

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=70ae08e460fc2d4578fa954ffdca0244631865f0
---

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

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 79a841d..e09cf48 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -153,8 +153,7 @@ 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" ) ||
-            CheckContentType( p_demux->s, "audio/x-ms-wax" ) ) && PeekASX( p_demux )
+          CheckContentType( p_demux->s, "video/x-ms-asf" ) && PeekASX( p_demux )
         ) ||
         demux_IsForced( p_demux, "asx-open" ) )
     {



More information about the vlc-commits mailing list