| Index: media/mojo/common/media_type_converters.cc
|
| diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc
|
| index 42e2febdb2ee63ba5fe13650af21dd3d5f43880a..d809016a9a8255f185cb822711d8a8e41bd614d4 100644
|
| --- a/media/mojo/common/media_type_converters.cc
|
| +++ b/media/mojo/common/media_type_converters.cc
|
| @@ -473,7 +473,10 @@ TypeConverter<scoped_refptr<media::DecoderBuffer>,
|
| scoped_refptr<media::DecoderBuffer> buffer(
|
| new media::DecoderBuffer(input->data_size));
|
|
|
| - buffer->CopySideDataFrom(&input->side_data.front(), input->side_data.size());
|
| + if (!input->side_data.empty()) {
|
| + buffer->CopySideDataFrom(&input->side_data.front(),
|
| + input->side_data.size());
|
| + }
|
|
|
| buffer->set_timestamp(
|
| base::TimeDelta::FromMicroseconds(input->timestamp_usec));
|
|
|