Revert 152406 - Introduce shared_memory_support media target for PPAPI.

media/base/channel_layout.h

Index: media/base/channel_layout.h
===================================================================
--- media/base/channel_layout.h	(revision 152430)
+++ media/base/channel_layout.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_CHANNEL_LAYOUT_H_
 #define MEDIA_BASE_CHANNEL_LAYOUT_H_
 
+#include "build/build_config.h"
 #include "media/base/media_export.h"
 
 enum ChannelLayout {
@@ -77,14 +78,15 @@
   CHANNELS_MAX
 };
 
+#if defined(OS_MACOSX) || defined(USE_PULSEAUDIO)
 // The channel orderings for each layout as specified by FFmpeg.
 // Values represent the index of each channel in each layout. For example, the
 // left side surround sound channel in FFmpeg's 5.1 layout is in the 5th
 // position (because the order is L, R, C, LFE, LS, RS), so
 // kChannelOrderings[CHANNEL_LAYOUT_5POINT1][SIDE_LEFT] = 4;
 // Values of -1 mean the channel at that index is not used for that layout.
-MEDIA_EXPORT extern const int
-kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX];
+extern const int kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX];
+#endif
 
 // Returns the number of channels in a given ChannelLayout.
 MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout);
Property changes on: media/base/channel_layout.h
___________________________________________________________________
Added: svn:mergeinfo