Move SwizzleCoreAudioLayout5_1() closer to where it's called.

media/audio/audio_util.h

Index: media/audio/audio_util.h
diff --git a/media/audio/audio_util.h b/media/audio/audio_util.h
index 15a0935bd7a642ee82f326a283355eaf5083e741..c74874d22dd3ee1de76f42b8de89b631969ba428 100644
--- a/media/audio/audio_util.h
+++ b/media/audio/audio_util.h
@@ -74,23 +74,6 @@ void InterleaveFloatToInt16(const std::vector<float*>& source,
                             int16* destination,
                             size_t number_of_frames);
 
-// Reorder PCM from AAC layout to Core Audio 5.1 layout.
-// TODO(fbarchard): Switch layout when ffmpeg is updated.
-template<class Format>
-void SwizzleCoreAudioLayout5_1(Format* b, uint32 filled) {
-  static const int kNumSurroundChannels = 6;
-  Format aac[kNumSurroundChannels];
-  for (uint32 i = 0; i < filled; i += sizeof(aac), b += kNumSurroundChannels) {
-    memcpy(aac, b, sizeof(aac));
-    b[0] = aac[1];  // L
-    b[1] = aac[2];  // R
-    b[2] = aac[0];  // C
-    b[3] = aac[5];  // LFE
-    b[4] = aac[3];  // Ls
-    b[5] = aac[4];  // Rs
-  }
-}
-
 // Returns the default audio hardware sample-rate.
 double GetAudioHardwareSampleRate();