wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1109552: Fix incorrect scoped_ptr type (uint8_t array vs ptr) r=glandium

Browse Source
This commit is contained in:
Randell Jesup 2014-12-23 18:16:02 -05:00
parent 47987a6d11
commit e725d38d76
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/webrtc/trunk/webrtc/modules/video_processing/main/source/content_analysis.cc
View File

@ -83,7 +83,7 @@ VideoContentMetrics* VPMContentAnalysis::ComputeContentMetrics(
int32_t VPMContentAnalysis::Release() {
content_metrics_.reset(NULL);
prev_frame_.reset(NULL);
prev_frame_.reset();
width_ = 0;
height_ = 0;
@ -112,7 +112,7 @@ int32_t VPMContentAnalysis::Initialize(int width, int height) {
}
content_metrics_.reset(NULL);
prev_frame_.reset(NULL);
prev_frame_.reset();
// Spatial Metrics don't work on a border of 8. Minimum processing
// block size is 16 pixels. So make sure the width and height support this.

2
media/webrtc/trunk/webrtc/modules/video_processing/main/source/content_analysis.h
View File

@ -66,7 +66,7 @@ class VPMContentAnalysis {
#endif
const uint8_t* orig_frame_;
scoped_ptr<uint8_t> prev_frame_;
scoped_ptr<uint8_t[]> prev_frame_;
int width_;
int height_;
int skip_num_;