diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:10:35 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:10:35 +0000 |
| commit | f4a5533a2701e5cbc5781ef38ca200f43611e3fd (patch) | |
| tree | 7d8ea7da9e47e1a48220f9a7e39b1a6cac27e1d1 /media/mp4 | |
| parent | e7b50eb5d00047ac6790b636adb0ad126113657e (diff) | |
| download | chromium_src-f4a5533a2701e5cbc5781ef38ca200f43611e3fd.zip chromium_src-f4a5533a2701e5cbc5781ef38ca200f43611e3fd.tar.gz chromium_src-f4a5533a2701e5cbc5781ef38ca200f43611e3fd.tar.bz2 | |
Move ChannelLayout into media namespace.
Also moves kChannelOrderings extern into a function for export compatibility
with MSVC++ and the shared_memory_support target.
BUG=none
TEST=compiles.
Review URL: https://codereview.chromium.org/11198018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/aac.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/mp4/aac.cc b/media/mp4/aac.cc index 2982687..0214eb3 100644 --- a/media/mp4/aac.cc +++ b/media/mp4/aac.cc @@ -17,6 +17,8 @@ static const int kFrequencyMap[] = { 22050, 16000, 12000, 11025, 8000, 7350 }; +namespace media { + static ChannelLayout GetChannelLayout(uint8 channel_config) { switch (channel_config) { case 1: @@ -40,8 +42,6 @@ static ChannelLayout GetChannelLayout(uint8 channel_config) { return CHANNEL_LAYOUT_UNSUPPORTED; } -namespace media { - namespace mp4 { AAC::AAC() |