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

Unified Diff: media/filters/ffmpeg_video_decoder.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: remove include 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_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 30c81346451aba58616f37b9ca41baa8ff78f71d..c5fdb45c44825c3ec3561c5454fa4cf60e37d8fb 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -6,10 +6,10 @@
#define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
#include <list>
+#include <memory>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "media/base/video_decoder.h"
#include "media/base/video_decoder_config.h"
@@ -83,8 +83,8 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
OutputCB output_cb_;
// FFmpeg structures owned by this object.
- scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
- scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
+ std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
+ std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
VideoDecoderConfig config_;
« no previous file with comments | « media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698