summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-20 21:59:28 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-20 21:59:28 +0000
commit528111d917ba6848d678d25f73c576d10303d62c (patch)
tree6f5e00d49bcdb4d4d599f93a9f15dd828e920e4a /libmpdemux
parente1ab85eba42b9a3bbaf5e9877f1b709f4e150a3b (diff)
downloadmpv-528111d917ba6848d678d25f73c576d10303d62c.tar.bz2
mpv-528111d917ba6848d678d25f73c576d10303d62c.tar.xz
More complete ASF MIME detection, closing bug# 248,
patch by Zuxy Meng < zuxy POIS meng AH gmail.com >, Approved by Bertrand Baudet, who agrees to get the cola shipment. :) Original thread: Date: Nov 2, 2005 7:11 AM Subject: [MPlayer-dev-eng] [PATCH] More complete ASF MIME detection, closing bug# 248 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17658 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/network.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index bd1c5e34e2..204b66c779 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -76,6 +76,8 @@ mime_struct_t mime_type_table[] = {
{ "video/x-ms-wmv", DEMUXER_TYPE_ASF },
{ "video/x-ms-wma", DEMUXER_TYPE_ASF },
{ "application/x-mms-framed", DEMUXER_TYPE_ASF },
+ { "application/vnd.ms.wms-hdr.asfv1", DEMUXER_TYPE_ASF },
+ { "application/octet-stream", DEMUXER_TYPE_ASF },
// Playlists
{ "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-scpls", DEMUXER_TYPE_PLAYLIST },