summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/base/media_format.cc7
-rw-r--r--media/base/media_format.h3
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();