| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef REMOTING_CODEC_SCOPED_VPX_CODEC_H_ | 5 #ifndef REMOTING_CODEC_SCOPED_VPX_CODEC_H_ |
| 6 #define REMOTING_CODEC_SCOPED_VPX_CODEC_H_ | 6 #define REMOTING_CODEC_SCOPED_VPX_CODEC_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include <memory> |
| 9 | 9 |
| 10 extern "C" { | 10 extern "C" { |
| 11 typedef struct vpx_codec_ctx vpx_codec_ctx_t; | 11 typedef struct vpx_codec_ctx vpx_codec_ctx_t; |
| 12 } | 12 } |
| 13 | 13 |
| 14 namespace remoting { | 14 namespace remoting { |
| 15 | 15 |
| 16 struct VpxCodecDeleter { | 16 struct VpxCodecDeleter { |
| 17 void operator()(vpx_codec_ctx_t* codec); | 17 void operator()(vpx_codec_ctx_t* codec); |
| 18 }; | 18 }; |
| 19 | 19 |
| 20 typedef scoped_ptr<vpx_codec_ctx_t, VpxCodecDeleter> ScopedVpxCodec; | 20 typedef std::unique_ptr<vpx_codec_ctx_t, VpxCodecDeleter> ScopedVpxCodec; |
| 21 | 21 |
| 22 } // namespace remoting | 22 } // namespace remoting |
| 23 | 23 |
| 24 #endif // REMOTING_CODEC_SCOPED_VPX_CODEC_H_ | 24 #endif // REMOTING_CODEC_SCOPED_VPX_CODEC_H_ |
| OLD | NEW |