diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
| commit | 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 (patch) | |
| tree | af8b16dc2ba7fc8c8bb1c9fa18b907c847f3883d /content/common/gpu/media/dxva_video_decode_accelerator.h | |
| parent | c70ef2906f891fe7d218980660e4cda465717916 (diff) | |
| download | chromium_org-424c4d7b64af9d0d8fd9624f381f469654d5e3d2.tar.gz | |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
Diffstat (limited to 'content/common/gpu/media/dxva_video_decode_accelerator.h')
| -rw-r--r-- | content/common/gpu/media/dxva_video_decode_accelerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.h b/content/common/gpu/media/dxva_video_decode_accelerator.h index 26b1ba7d46..206099cfd7 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.h +++ b/content/common/gpu/media/dxva_video_decode_accelerator.h @@ -17,6 +17,7 @@ #include "base/threading/non_thread_safe.h" #include "base/win/scoped_comptr.h" #include "content/common/content_export.h" +#include "content/common/gpu/media/video_decode_accelerator_impl.h" #include "media/video/video_decode_accelerator.h" interface IMFSample; @@ -29,7 +30,7 @@ namespace content { // This class lives on a single thread and DCHECKs that it is never accessed // from any other. class CONTENT_EXPORT DXVAVideoDecodeAccelerator - : public media::VideoDecodeAccelerator, + : public VideoDecodeAcceleratorImpl, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: enum State { |