summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 16:28:14 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 16:28:14 +0000
commit9e08904e41c05b990499c19d2781c54de12ba10f (patch)
tree258e0dd15e607d8ac7d30e41f1fb586ec7a85408 /media
parentcd2480f4de9f51ca066932fd7c048f8d8fc9c223 (diff)
downloadchromium_src-9e08904e41c05b990499c19d2781c54de12ba10f.zip
chromium_src-9e08904e41c05b990499c19d2781c54de12ba10f.tar.gz
chromium_src-9e08904e41c05b990499c19d2781c54de12ba10f.tar.bz2
Fix COM initialization on media thread.
BUG=134624,136238 TEST=none TBR=tommi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10744002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/win/device_enumeration_win.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/audio/win/device_enumeration_win.cc b/media/audio/win/device_enumeration_win.cc
index d226986..c93a16b 100644
--- a/media/audio/win/device_enumeration_win.cc
+++ b/media/audio/win/device_enumeration_win.cc
@@ -33,6 +33,7 @@ bool GetInputDeviceNamesWin(AudioDeviceNames* device_names) {
CLSCTX_INPROC_SERVER,
__uuidof(IMMDeviceEnumerator),
enumerator.ReceiveVoid());
+ DCHECK_NE(hr, CO_E_NOTINITIALIZED);
if (FAILED(hr)) {
LOG(WARNING) << "Failed to create IMMDeviceEnumerator: " << std::hex << hr;
return false;