| Index: content/common/gpu/media/android_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h
|
| index b2270a2ef6c3693a6162f6aeec3809affa7c5f31..35f7ae0caa6c437625a486f48eb1b638dcf783ac 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -34,12 +34,12 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| public:
|
| // Does not take ownership of |client| which must outlive |*this|.
|
| AndroidVideoDecodeAccelerator(
|
| - media::VideoDecodeAccelerator::Client* client,
|
| const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
|
| const base::Callback<bool(void)>& make_context_current);
|
|
|
| // media::VideoDecodeAccelerator implementation.
|
| - virtual bool Initialize(media::VideoCodecProfile profile) OVERRIDE;
|
| + virtual bool Initialize(media::VideoCodecProfile profile,
|
| + Client* client) OVERRIDE;
|
| virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
|
| virtual void AssignPictureBuffers(
|
| const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
|
|
|