Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: media/filters/ffmpeg_glue.h

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
};

Powered by Google App Engine
This is Rietveld 408576698