| Index: media/mojo/services/media_type_converters.h
|
| diff --git a/media/mojo/services/media_type_converters.h b/media/mojo/services/media_type_converters.h
|
| index 37e224f6fd0de13ea73b6b2ef9c0e92a3fdeb680..0133a9986310b40cac18babebac8fb8b977b08d3 100644
|
| --- a/media/mojo/services/media_type_converters.h
|
| +++ b/media/mojo/services/media_type_converters.h
|
| @@ -52,16 +52,16 @@ struct TypeConverter<scoped_ptr<media::DecryptConfig>,
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<media::interfaces::MediaDecoderBufferPtr,
|
| +struct TypeConverter<media::interfaces::DecoderBufferPtr,
|
| scoped_refptr<media::DecoderBuffer>> {
|
| - static media::interfaces::MediaDecoderBufferPtr Convert(
|
| + static media::interfaces::DecoderBufferPtr Convert(
|
| const scoped_refptr<media::DecoderBuffer>& input);
|
| };
|
| template <>
|
| struct TypeConverter<scoped_refptr<media::DecoderBuffer>,
|
| - media::interfaces::MediaDecoderBufferPtr> {
|
| + media::interfaces::DecoderBufferPtr> {
|
| static scoped_refptr<media::DecoderBuffer> Convert(
|
| - const media::interfaces::MediaDecoderBufferPtr& input);
|
| + const media::interfaces::DecoderBufferPtr& input);
|
| };
|
|
|
| template <>
|
|
|