| Index: media/base/android/media_codec_player.h
|
| diff --git a/media/base/android/media_codec_player.h b/media/base/android/media_codec_player.h
|
| index ccc691d92ff55eb096c9106256d677542cab4a3a..30a4baf9772b891a75d6a5f69c699d944a70f96a 100644
|
| --- a/media/base/android/media_codec_player.h
|
| +++ b/media/base/android/media_codec_player.h
|
| @@ -158,8 +158,8 @@
|
|
|
| namespace media {
|
|
|
| -class MediaCodecAudioDecoder;
|
| -class MediaCodecVideoDecoder;
|
| +class AudioMediaCodecDecoder;
|
| +class VideoMediaCodecDecoder;
|
|
|
| class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
|
| public DemuxerAndroidClient {
|
| @@ -344,8 +344,8 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
|
|
|
| // Major components: demuxer, audio and video decoders.
|
| scoped_ptr<DemuxerAndroid> demuxer_;
|
| - scoped_ptr<MediaCodecAudioDecoder> audio_decoder_;
|
| - scoped_ptr<MediaCodecVideoDecoder> video_decoder_;
|
| + scoped_ptr<AudioMediaCodecDecoder> audio_decoder_;
|
| + scoped_ptr<VideoMediaCodecDecoder> video_decoder_;
|
|
|
| // The state of the state machine.
|
| PlayerState state_;
|
|
|