diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /media/base/audio_bus.h | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/base/audio_bus.h')
| -rw-r--r-- | media/base/audio_bus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index dbb49ca57f..d1106f558e 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -47,7 +47,6 @@ class MEDIA_EXPORT AudioBus { static scoped_ptr<AudioBus> WrapMemory(int channels, int frames, void* data); static scoped_ptr<AudioBus> WrapMemory(const AudioParameters& params, void* data); - // Returns the required memory size to use the WrapMemory() method. static int CalculateMemorySize(const AudioParameters& params); // Calculates the required size for an AudioBus given the number of channels |