Commit fea76a74 authored by Bastien Nocera's avatar Bastien Nocera

plparse: Fix parsing of Windows Media files

With recent versions of shared-mime-info, application/vnd.ms-asf is
preferred to video/x-ms-asf. This broke parsing of videos masquerading
as playlists, and vice-versa.
parent 6f858e0c
......@@ -79,7 +79,7 @@
#define OPML_MIME_TYPE "text/x-opml+xml"
#define QUICKTIME_META_MIME_TYPE "application/x-quicktime-media-link"
#define ASX_MIME_TYPE "audio/x-ms-asx"
#define ASF_REF_MIME_TYPE "video/x-ms-asf"
#define ASF_REF_MIME_TYPE "application/vnd.ms-asf"
#define TOTEM_PL_PARSER_FIELD_FILE "gfile-object"
#define TOTEM_PL_PARSER_FIELD_BASE_FILE "gfile-object-base"
......
......@@ -233,6 +233,7 @@ static PlaylistTypes dual_types[] = {
PLAYLIST_TYPE2 ("application/x-php", NULL, NULL),
PLAYLIST_TYPE2 ("audio/x-ms-asx", totem_pl_parser_add_asx, totem_pl_parser_is_asx),
PLAYLIST_TYPE2 ("video/x-ms-asf", totem_pl_parser_add_asf, totem_pl_parser_is_asf),
PLAYLIST_TYPE2 ("application/vnd.ms-asf", totem_pl_parser_add_asf, totem_pl_parser_is_asf),
PLAYLIST_TYPE2 ("video/x-ms-wmv", totem_pl_parser_add_asf, totem_pl_parser_is_asf),
PLAYLIST_TYPE2 ("audio/x-ms-wma", totem_pl_parser_add_asf, totem_pl_parser_is_asf),
PLAYLIST_TYPE2 ("video/quicktime", totem_pl_parser_add_quicktime, totem_pl_parser_is_quicktime),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment