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

Unified Diff: media/filters/h264_parser.cc

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
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/h264_to_annex_b_bitstream_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/h264_parser.cc
diff --git a/media/filters/h264_parser.cc b/media/filters/h264_parser.cc
index d1fa685d42f9e0857cd7c50d81ce34549f759d8d..a70afcc84ba84fcdd3ffcd44a2e3b4c32c4e2e95 100644
--- a/media/filters/h264_parser.cc
+++ b/media/filters/h264_parser.cc
@@ -5,10 +5,10 @@
#include "media/filters/h264_parser.h"
#include <limits>
+#include <memory>
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "media/base/decrypt_config.h"
@@ -783,7 +783,7 @@ H264Parser::Result H264Parser::ParseSPS(int* sps_id) {
*sps_id = -1;
- scoped_ptr<H264SPS> sps(new H264SPS());
+ std::unique_ptr<H264SPS> sps(new H264SPS());
READ_BITS_OR_RETURN(8, &sps->profile_idc);
READ_BOOL_OR_RETURN(&sps->constraint_set0_flag);
@@ -902,7 +902,7 @@ H264Parser::Result H264Parser::ParsePPS(int* pps_id) {
*pps_id = -1;
- scoped_ptr<H264PPS> pps(new H264PPS());
+ std::unique_ptr<H264PPS> pps(new H264PPS());
READ_UE_OR_RETURN(&pps->pic_parameter_set_id);
READ_UE_OR_RETURN(&pps->seq_parameter_set_id);
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/h264_to_annex_b_bitstream_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698