diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /media/base/data_buffer.cc | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'media/base/data_buffer.cc')
| -rw-r--r-- | media/base/data_buffer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc index 898a477470..9bd67d5928 100644 --- a/media/base/data_buffer.cc +++ b/media/base/data_buffer.cc @@ -15,7 +15,7 @@ DataBuffer::DataBuffer(int buffer_size) data_.reset(new uint8[buffer_size_]); } -DataBuffer::DataBuffer(scoped_array<uint8> buffer, int buffer_size) +DataBuffer::DataBuffer(scoped_ptr<uint8[]> buffer, int buffer_size) : data_(buffer.Pass()), buffer_size_(buffer_size), data_size_(buffer_size) { |