1 files changed, 2 insertions, 50 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc
index 80c60e0..45df6b6 100644
--- a/media/base/media_format.cc
+++ b/media/base/media_format.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,52 +6,6 @@
 
 namespace media {
 
-namespace mime_type {
-
-// Represents a URL, typically used to create a DataSourceInterface.
-// Expected keys:
-//   kURL             String          The URL
-const char kURL[]                           = "text/x-url";
-
-// Represents a generic byte stream, typically from a DataSourceInterface.
-// Expected keys:
-//   None
-const char kApplicationOctetStream[]        = "application/octet-stream";
-
-// Represents encoded audio data, typically from an DemuxerStreamInterface.
-// Expected keys:
-//   None
-const char kMPEGAudio[]                     = "audio/mpeg";
-const char kAACAudio[]                      = "audio/aac";
-
-// Represents encoded video data, typically from a DemuxerStreamInterface.
-// Expected keys:
-//   None
-const char kH264AnnexB[]                    = "video/x-h264-annex-b";
-
-// Represents decoded audio data, typically from an AudioDecoderInterface.
-// Expected keys:
-//   kChannels        Integer         Number of audio channels
-//   kSampleRate      Integer         Audio sample rate (i.e., 44100)
-//   kSampleBits      Integer         Audio bits-per-sample (i.e., 16)
-const char kUncompressedAudio[]             = "audio/x-uncompressed";
-
-// Represents decoded video data, typically from a VideoDecoderInterface.
-// Other information, such as surface format (i.e., YV12), stride and planes are
-// included with the buffer itself and is not part of the MediaFormat.
-// Expected keys:
-//   kWidth           Integer         Display width of the surface
-//   kHeight          Integer         Display height of the surface
-const char kUncompressedVideo[]             = "video/x-uncompressed";
-
-// Major types of media types begin with the prefix "audio/" or "video/".
-const char kMajorTypeVideo[]                = "video/";
-const char kMajorTypeAudio[]                = "audio/";
-
-}  // namespace mime_type
-
-// Common keys.
-const char MediaFormat::kMimeType[]         = "MimeType";
 const char MediaFormat::kURL[]              = "URL";
 const char MediaFormat::kSurfaceFormat[]    = "SurfaceFormat";
 const char MediaFormat::kSurfaceType[]      = "SurfaceType";
@@ -60,10 +14,8 @@ const char MediaFormat::kSampleBits[]       = "SampleBits";
 const char MediaFormat::kChannels[]         = "Channels";
 const char MediaFormat::kWidth[]            = "Width";
 const char MediaFormat::kHeight[]           = "Height";
-const char MediaFormat::kFFmpegCodecID[]    = "FFmpegCodecID";
 
-MediaFormat::MediaFormat() {
-}
+MediaFormat::MediaFormat() {}
 
 MediaFormat::~MediaFormat() {
   Clear();