Permalink
Browse files

Revert Matroska MIME to 'video/x-matroska'.

If different clients are expecting different MIME times, the only
sensible solution is to use the one dictated by Matroska.

http://matroska.org/technical/specs/notes.html#MIME
Refs #8643
Fixes #10980
(cherry picked from commit 749ac86)
  • Loading branch information...
1 parent 05a3d73 commit cf06841da2364878ca7f4eff0240f9c470e841da @wagnerrp wagnerrp committed Sep 10, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 mythtv/libs/libmythupnp/httprequest.cpp
@@ -85,7 +85,10 @@ static MIMETypes g_MIMETypes[] =
{ "mov" , "video/quicktime" },
{ "mp4" , "video/mp4" },
// This formerly was video/x-matroska, but got changed due to #8643
- { "mkv" , "video/x-mkv" },
+ // This was reverted from video/x-mkv, due to #10980
+ // See http://matroska.org/technical/specs/notes.html#MIME
+ // If you can't please everyone, may as well be correct as you piss some off
+ { "mkv" , "video/x-matroska" },
{ "mka" , "audio/x-matroska" },
{ "wmv" , "video/x-ms-wmv" },
// Defined: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

0 comments on commit cf06841

Please sign in to comment.