Index: trunk/src/media/video/capture/win/video_capture_device_factory_win.cc |
=================================================================== |
--- trunk/src/media/video/capture/win/video_capture_device_factory_win.cc (revision 278313) |
+++ trunk/src/media/video/capture/win/video_capture_device_factory_win.cc (working copy) |
@@ -220,7 +220,6 @@ |
continue; |
} |
- std::string id; |
Dominik Grewe
2014/06/19 10:17:38
Removing this line is causing a compile failure. C
|
device_id.Reset(); |
hr = prop_bag->Read(L"DevicePath", device_id.Receive(), 0); |
if (FAILED(hr) || device_id.type() != VT_BSTR) { |
@@ -236,8 +235,7 @@ |
DCHECK_EQ(device_id.type(), VT_BSTR); |
id = base::SysWideToUTF8(V_BSTR(&device_id)); |
} |
- |
- if (device.id() == id) |
+ if (device.id() == base::SysWideToUTF8(V_BSTR(&device_id))) |
break; |
moniker.Release(); |
} |