From 55bb164fb587d126d86a2621074d3245c245616e Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 29 Nov 2003 04:38:44 +0000 Subject: [PATCH] global change to video/x-ms-asf and video/x-msvideo Original commit message from CVS: global change to video/x-ms-asf and video/x-msvideo --- docs/pwg/intro-basics.xml | 2 +- docs/random/mimetypes | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pwg/intro-basics.xml b/docs/pwg/intro-basics.xml index 16ca6e4f70..43f9efd770 100644 --- a/docs/pwg/intro-basics.xml +++ b/docs/pwg/intro-basics.xml @@ -460,7 +460,7 @@ - video/avi + video/x-msvideo Video data compressed using the AVI encoding scheme. diff --git a/docs/random/mimetypes b/docs/random/mimetypes index 417283cffd..e2bbe72ac9 100644 --- a/docs/random/mimetypes +++ b/docs/random/mimetypes @@ -57,9 +57,9 @@ audio stream, even when it is compressed. Another problem is that many media types can be defined in multiple ways. For example, MJPEG video can be defined as 'video/jpeg', 'video/mjpeg', -'image/jpeg', 'video/avi' with a compression of (fourcc) MJPG, etc. None of -these is really official, since there isn't an official mimetype for encoded -MJPEG video. +'image/jpeg', 'video/x-msvideo' with a compression of (fourcc) MJPG, etc. +None of these is really official, since there isn't an official mimetype +for encoded MJPEG video. The main focus of this document is to propose a standardized set of MIME types and properties that will be used by the GStreamer plugins. @@ -86,7 +86,7 @@ Container formats ----------------- 1 - AVI (Microsoft RIFF/AVI) - MIME type: video/avi + MIME type: video/x-msvideo Properties: Parser: avidemux Formatter: avimux @@ -104,7 +104,7 @@ Container formats Formatter: 4 - ASF (Microsoft) - MIME type: video/x-asf + MIME type: video/x-ms-asf Properties: Parser: asfdemux Formatter: