| Index: media/video/video_encode_accelerator.h
|
| diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h
|
| index 6879b0de714f0f361c82ae83624939649447f7c7..39ad0b70c302457b63f72456b7b25693fa8685b9 100644
|
| --- a/media/video/video_encode_accelerator.h
|
| +++ b/media/video/video_encode_accelerator.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_
|
| #define MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| @@ -155,19 +156,15 @@ class MEDIA_EXPORT VideoEncodeAccelerator {
|
|
|
| } // namespace media
|
|
|
| -namespace base {
|
| +namespace std {
|
|
|
| -template <class T>
|
| -struct DefaultDeleter;
|
| -
|
| -// Specialize DefaultDeleter so that scoped_ptr<VideoEncodeAccelerator> always
|
| +// Specialize std::default_delete so that scoped_ptr<VideoEncodeAccelerator>
|
| // uses "Destroy()" instead of trying to use the destructor.
|
| template <>
|
| -struct MEDIA_EXPORT DefaultDeleter<media::VideoEncodeAccelerator> {
|
| - public:
|
| - void operator()(void* video_encode_accelerator) const;
|
| +struct MEDIA_EXPORT default_delete<media::VideoEncodeAccelerator> {
|
| + void operator()(media::VideoEncodeAccelerator* vea) const;
|
| };
|
|
|
| -} // namespace base
|
| +} // namespace std
|
|
|
| #endif // MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_
|
|
|