summaryrefslogtreecommitdiffstats
path: root/media/base/channel_layout.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
commitd3c8aa84c5bf94c58b88b35d169694837cb454e5 (patch)
tree658c8300583e4adb5148c0d093677bf14690e28c /media/base/channel_layout.h
parent4fbd79f46b1e5c580238c3cf0a8532144019e7d0 (diff)
downloadchromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.zip
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.gz
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.bz2
Revert r95841 due to failing media_unittests on linux_shared bot.
TBR=fischman@chromium.org Review URL: http://codereview.chromium.org/7601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/channel_layout.h')
-rw-r--r--media/base/channel_layout.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/base/channel_layout.h b/media/base/channel_layout.h
index 7dd1ec8..3fa84ba 100644
--- a/media/base/channel_layout.h
+++ b/media/base/channel_layout.h
@@ -5,8 +5,6 @@
#ifndef MEDIA_BASE_CHANNEL_LAYOUT_H_
#define MEDIA_BASE_CHANNEL_LAYOUT_H_
-#include "media/base/media_export.h"
-
enum ChannelLayout {
CHANNEL_LAYOUT_NONE = 0,
CHANNEL_LAYOUT_UNSUPPORTED,
@@ -86,6 +84,6 @@ enum Channels {
extern const int kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX];
// Returns the number of channels in a given ChannelLayout.
-MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout);
+int ChannelLayoutToChannelCount(ChannelLayout layout);
#endif // MEDIA_BASE_CHANNEL_LAYOUT_H_