Chromium Code Reviews| Index: media/base/decoder_buffer.cc |
| diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc |
| index aec45211f10d3d68998e304b445e463ea55b0f61..23cad327f29c2f12f3ec96f761dbf1cc1b203349 100644 |
| --- a/media/base/decoder_buffer.cc |
| +++ b/media/base/decoder_buffer.cc |
| @@ -33,12 +33,14 @@ DecoderBuffer::DecoderBuffer(const uint8* data, int size, |
| side_data_size_(side_data_size) { |
| if (!data) { |
| CHECK_EQ(size_, 0); |
| + CHECK(!side_data); |
| return; |
| } |
| Initialize(); |
| memcpy(data_.get(), data, size_); |
| - memcpy(side_data_.get(), side_data, side_data_size_); |
| + if (side_data_size_ > 0) |
|
acolwell GONE FROM CHROMIUM
2013/05/21 19:47:48
nit: Per offline discussion. s/side_data_size_/sid
vignesh
2013/05/21 21:05:21
Done.
|
| + memcpy(side_data_.get(), side_data, side_data_size_); |
| } |
| DecoderBuffer::~DecoderBuffer() {} |