| Index: media/filters/ffmpeg_glue.h
|
| diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
|
| index 0093dab97189555101fc3be86682c18322a199a2..7d464eb37a67dce62a2c648f0b11046504ac8150 100644
|
| --- a/media/filters/ffmpeg_glue.h
|
| +++ b/media/filters/ffmpeg_glue.h
|
| @@ -27,8 +27,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "media/base/media_export.h"
|
| #include "media/ffmpeg/ffmpeg_deleters.h"
|
|
|
| @@ -74,7 +75,7 @@ class MEDIA_EXPORT FFmpegGlue {
|
| private:
|
| bool open_called_;
|
| AVFormatContext* format_context_;
|
| - scoped_ptr<AVIOContext, ScopedPtrAVFree> avio_context_;
|
| + std::unique_ptr<AVIOContext, ScopedPtrAVFree> avio_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
|
| };
|
|
|