admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Win64 compile of videoadapter_unittest.cc.

Browse Source 
Missed an typecast in videoadapter_unittest.cc in r6979 due to
tryservers being clogged and me waiting for a windows, linux, mac and
tsanv2 bot to finish was not enough. Committing fix straight away to
un-break tree.

TBR=tommi@webrtc.org
BUG=3671

Review URL: https://webrtc-codereview.appspot.com/18279004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6980 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-08-26 12:46:57 +00:00
parent c9b3f77e65
commit f21ac1fd46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/media/base/videoadapter_unittest.cc
View File

@ -121,8 +121,8 @@ class VideoAdapterTest : public testing::Test {
stats.dropped_frames = dropped_frames_;
stats.last_adapt_was_no_op = last_adapt_was_no_op_;
if (adapted_frame_ != NULL) {
stats.adapted_width = adapted_frame_->GetWidth();
stats.adapted_height = adapted_frame_->GetHeight();
stats.adapted_width = static_cast<int>(adapted_frame_->GetWidth());
stats.adapted_height = static_cast<int>(adapted_frame_->GetHeight());
} else {
stats.adapted_width = stats.adapted_height = -1;
}