diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /media/base/audio_decoder.h | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'media/base/audio_decoder.h')
| -rw-r--r-- | media/base/audio_decoder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h index c88aab3d2e..aa2eeb80ea 100644 --- a/media/base/audio_decoder.h +++ b/media/base/audio_decoder.h @@ -13,7 +13,7 @@ namespace media { -class DataBuffer; +class AudioBuffer; class DemuxerStream; class MEDIA_EXPORT AudioDecoder { @@ -45,7 +45,8 @@ class MEDIA_EXPORT AudioDecoder { // indicate the end of the stream. A NULL buffer pointer indicates an aborted // Read(). This can happen if the DemuxerStream gets flushed and doesn't have // any more data to return. - typedef base::Callback<void(Status, const scoped_refptr<DataBuffer>&)> ReadCB; + typedef base::Callback<void(Status, const scoped_refptr<AudioBuffer>&)> + ReadCB; virtual void Read(const ReadCB& read_cb) = 0; // Reset decoder state, dropping any queued encoded data. |