| Index: chromecast/renderer/media/media_pipeline_proxy.h
|
| diff --git a/chromecast/renderer/media/media_pipeline_proxy.h b/chromecast/renderer/media/media_pipeline_proxy.h
|
| index de3a638ba25db00001ebcdbafd89c9662fec2e49..a39ef1c75030adb396bb61a26184ef20923cdba2 100644
|
| --- a/chromecast/renderer/media/media_pipeline_proxy.h
|
| +++ b/chromecast/renderer/media/media_pipeline_proxy.h
|
| @@ -43,7 +43,7 @@ class MediaPipelineProxy : public MediaPipeline {
|
| scoped_ptr<CodedFrameProvider> frame_provider,
|
| const ::media::PipelineStatusCB& status_cb) override;
|
| void InitializeVideo(
|
| - const ::media::VideoDecoderConfig& config,
|
| + const std::vector<::media::VideoDecoderConfig>& configs,
|
| scoped_ptr<CodedFrameProvider> frame_provider,
|
| const ::media::PipelineStatusCB& status_cb) override;
|
| void StartPlayingFrom(base::TimeDelta time) override;
|
| @@ -70,7 +70,7 @@ class MediaPipelineProxy : public MediaPipeline {
|
| bool has_video_;
|
| scoped_ptr<AudioPipelineProxy> audio_pipeline_;
|
| scoped_ptr<VideoPipelineProxy> video_pipeline_;
|
| - scoped_ptr< ::media::SerialRunner> pending_callbacks_;
|
| + scoped_ptr<::media::SerialRunner> pending_callbacks_;
|
|
|
| base::WeakPtr<MediaPipelineProxy> weak_this_;
|
| base::WeakPtrFactory<MediaPipelineProxy> weak_factory_;
|
|
|