| Index: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_video_decoder_impl.cc (revision 113301)
|
| +++ webkit/plugins/ppapi/ppb_video_decoder_impl.cc (working copy)
|
| @@ -190,7 +190,7 @@
|
|
|
| FlushCommandBuffer();
|
| platform_video_decoder_->Destroy();
|
| - ::ppapi::PPB_VideoDecoder_Shared::Destroy();
|
| + ::ppapi::VideoDecoderImpl::Destroy();
|
| platform_video_decoder_ = NULL;
|
| ppp_videodecoder_ = NULL;
|
| }
|
|
|
| Property changes on: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_video_decoder_impl.cc:r3734-4217,4606-5108,5177-5263
|
|
|
|
|