diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 23:30:08 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 23:30:08 +0000 |
| commit | 17757cec1b1104ceef2a41185a9e06ae65eacea4 (patch) | |
| tree | 02dc75b9a4cd9b0aa901c866727a6f8e1b44e0b6 /media | |
| parent | 61d362a02f5f7b6afe23dea1b66f4125f395ef24 (diff) | |
| download | chromium_src-17757cec1b1104ceef2a41185a9e06ae65eacea4.zip chromium_src-17757cec1b1104ceef2a41185a9e06ae65eacea4.tar.gz chromium_src-17757cec1b1104ceef2a41185a9e06ae65eacea4.tar.bz2 | |
Removed FFmpeg constants from media::MediaFormat and media::mime_type.
They're specific to the FFmpeg filters themselves and shouldn't be declared here. They're not used anywhere at the moment so removing them is fine for now.
Review URL: http://codereview.chromium.org/17240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_format.cc | 7 | ||||
| -rw-r--r-- | media/base/media_format.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc index 4331fb1..304956f 100644 --- a/media/base/media_format.cc +++ b/media/base/media_format.cc @@ -44,12 +44,6 @@ const char kUncompressedAudio[] = "audio/x-uncompressed"; // kHeight Integer Display height of the surface const char kUncompressedVideo[] = "video/x-uncompressed"; -// Represents FFmpeg encoded packets, typically from an DemuxerStreamInterface. -// Expected keys: -// kFfmpegCodecId Integer The FFmpeg CodecID identifying the decoder -const char kFFmpegAudio[] = "audio/x-ffmpeg"; -const char kFFmpegVideo[] = "video/x-ffmpeg"; - } // namespace mime_type // Common keys. @@ -61,7 +55,6 @@ 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() { } diff --git a/media/base/media_format.h b/media/base/media_format.h index c5132a9..6df9f17 100644 --- a/media/base/media_format.h +++ b/media/base/media_format.h @@ -18,8 +18,6 @@ extern const char kAACAudio[]; extern const char kH264AnnexB[]; extern const char kUncompressedAudio[]; extern const char kUncompressedVideo[]; -extern const char kFFmpegAudio[]; -extern const char kFFmpegVideo[]; } // namespace mime_type // MediaFormat is used to describe the output of a MediaFilterInterface to @@ -49,7 +47,6 @@ class MediaFormat { static const char kChannels[]; static const char kWidth[]; static const char kHeight[]; - static const char kFfmpegCodecId[]; MediaFormat(); ~MediaFormat(); |