Commit b4a622cf authored by Sergey Lyubka's avatar Sergey Lyubka

merge

parents 8c118bf4 728ebdaa
...@@ -1939,6 +1939,7 @@ static const struct { ...@@ -1939,6 +1939,7 @@ static const struct {
{".mpg", 4, "video/mpeg"}, {".mpg", 4, "video/mpeg"},
{".webm", 5, "video/webm"}, {".webm", 5, "video/webm"},
{".mpeg", 5, "video/mpeg"}, {".mpeg", 5, "video/mpeg"},
{".mov", 4, "video/quicktime"},
{".mp4", 4, "video/mp4"}, {".mp4", 4, "video/mp4"},
{".m4v", 4, "video/x-m4v"}, {".m4v", 4, "video/x-m4v"},
{".asf", 4, "video/x-ms-asf"}, {".asf", 4, "video/x-ms-asf"},
......
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