diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /media/base/audio_converter.cc | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'media/base/audio_converter.cc')
| -rw-r--r-- | media/base/audio_converter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc index d7c09f795a..ac82e314ba 100644 --- a/media/base/audio_converter.cc +++ b/media/base/audio_converter.cc @@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "media/base/audio_bus.h" #include "media/base/audio_pull_fifo.h" #include "media/base/channel_mixer.h" #include "media/base/multi_channel_resampler.h" |