Index: media/base/decryptor.h |
diff --git a/media/base/decryptor.h b/media/base/decryptor.h |
index 2793be42a43646f35313b84327dab4dfd9c73414..6051c634a4731cd0da246ba90be01ff50d6e967a 100644 |
--- a/media/base/decryptor.h |
+++ b/media/base/decryptor.h |
@@ -131,11 +131,7 @@ class MEDIA_EXPORT Decryptor { |
const KeyAddedCB& key_added_cb) = 0; |
// Helper structure for managing multiple decoded audio buffers per input. |
- struct QueuedAudioBuffer { |
- AudioDecoder::Status status; |
- scoped_refptr<Buffer> buffer; |
- }; |
- typedef std::list<QueuedAudioBuffer> AudioBuffers; |
+ typedef std::list<scoped_refptr<Buffer> > AudioBuffers; |
xhwang
2012/10/18 02:14:10
This cl is based on 11144036, so the changes in th
|
// Indicates completion of audio/video decrypt-and-decode operation. |
// |
@@ -153,8 +149,7 @@ class MEDIA_EXPORT Decryptor { |
// - Set to kError if unexpected error has occurred. In this case the |
// second parameter must be NULL. |
// Second parameter: The decoded video frame or audio buffers. |
- typedef base::Callback<void(Status, |
- const scoped_ptr<AudioBuffers>&)> AudioDecodeCB; |
+ typedef base::Callback<void(Status, const AudioBuffers&)> AudioDecodeCB; |
typedef base::Callback<void(Status, |
const scoped_refptr<VideoFrame>&)> VideoDecodeCB; |