| Index: media/gpu/avda_codec_image.h
|
| diff --git a/media/gpu/avda_codec_image.h b/media/gpu/avda_codec_image.h
|
| index 95b2ebff78246cd5e89e7a63554a22b8aee49e5b..a60e7d7050da091954cf2594ea6bdc3da812280f 100644
|
| --- a/media/gpu/avda_codec_image.h
|
| +++ b/media/gpu/avda_codec_image.h
|
| @@ -27,7 +27,7 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
|
| public:
|
| AVDACodecImage(int picture_buffer_id,
|
| const scoped_refptr<AVDASharedState>& shared_state,
|
| - media::VideoCodecBridge* codec,
|
| + VideoCodecBridge* codec,
|
| const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder,
|
| const scoped_refptr<gl::SurfaceTexture>& surface_texture);
|
|
|
| @@ -72,7 +72,7 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
|
| void UpdateSurface(UpdateMode update_mode);
|
|
|
| // Updates the MediaCodec for this image; clears |codec_buffer_index_|.
|
| - void CodecChanged(media::MediaCodecBridge* codec);
|
| + void CodecChanged(MediaCodecBridge* codec);
|
|
|
| void set_texture(gpu::gles2::Texture* texture) { texture_ = texture; }
|
|
|
| @@ -139,7 +139,7 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
|
| gfx::Size size_;
|
|
|
| // May be null.
|
| - media::MediaCodecBridge* media_codec_;
|
| + MediaCodecBridge* media_codec_;
|
|
|
| const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_;
|
|
|
|
|