diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 01:34:40 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 01:34:40 +0000 |
| commit | 0cf0d6aa24535cf47aa8548683ee937058d94011 (patch) | |
| tree | 51eb2a5fc5333a0e238a654530749563e67f2398 /media/base/media_format.cc | |
| parent | 02309e83cd17cdde3bec9be3f18de20aa69c961e (diff) | |
| download | chromium_src-0cf0d6aa24535cf47aa8548683ee937058d94011.zip chromium_src-0cf0d6aa24535cf47aa8548683ee937058d94011.tar.gz chromium_src-0cf0d6aa24535cf47aa8548683ee937058d94011.tar.bz2 | |
Changed media::kRawAudio/Video constants to the correct media::kUncompressedAudio/Video.
They were previously changed in the header file but I forgot to change the source file.
Review URL: http://codereview.chromium.org/17222
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_format.cc')
| -rw-r--r-- | media/base/media_format.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc index 6e41b1e..4331fb1 100644 --- a/media/base/media_format.cc +++ b/media/base/media_format.cc @@ -34,7 +34,7 @@ const char kH264AnnexB[] = "video/x-h264-annex-b"; // 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 kRawAudio[] = "audio/x-uncompressed"; +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 @@ -42,7 +42,7 @@ const char kRawAudio[] = "audio/x-uncompressed"; // Expected keys: // kWidth Integer Display width of the surface // kHeight Integer Display height of the surface -const char kRawVideo[] = "video/x-uncompressed"; +const char kUncompressedVideo[] = "video/x-uncompressed"; // Represents FFmpeg encoded packets, typically from an DemuxerStreamInterface. // Expected keys: |