diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /media/video/mft_h264_decode_engine.h | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/mft_h264_decode_engine.h')
| -rw-r--r-- | media/video/mft_h264_decode_engine.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/video/mft_h264_decode_engine.h b/media/video/mft_h264_decode_engine.h index 9ce7935..9a2ca5d 100644 --- a/media/video/mft_h264_decode_engine.h +++ b/media/video/mft_h264_decode_engine.h @@ -17,7 +17,7 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/scoped_comptr_win.h" +#include "base/win/scoped_comptr.h" #include "media/video/video_decode_engine.h" struct IDirect3DSurface9; @@ -77,11 +77,12 @@ class MftH264DecodeEngine : public media::VideoDecodeEngine { bool DoDecode(const PipelineStatistics& statistics); void OnAllocFramesDone(); void OnUploadVideoFrameDone( - ScopedComPtr<IDirect3DSurface9, &IID_IDirect3DSurface9> surface, + base::win::ScopedComPtr<IDirect3DSurface9, + &IID_IDirect3DSurface9> surface, scoped_refptr<media::VideoFrame> frame, PipelineStatistics statistics); bool use_dxva_; - ScopedComPtr<IMFTransform> decode_engine_; + base::win::ScopedComPtr<IMFTransform> decode_engine_; MFT_INPUT_STREAM_INFO input_stream_info_; MFT_OUTPUT_STREAM_INFO output_stream_info_; |