new file mode 100644
--- /dev/null
+++ b/media/libcubeb/retry-device-unavailable.patch
@@ -0,0 +1,33 @@
+diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp
+--- a/media/libcubeb/src/cubeb_wasapi.cpp
++++ b/media/libcubeb/src/cubeb_wasapi.cpp
+@@ -695,22 +695,23 @@ HRESULT get_default_endpoint(IMMDevice *
+   if (FAILED(hr)) {
+     LOG("Could not get device enumerator: %x\n", hr);
+     return hr;
+   }
+   /* eMultimedia is okay for now ("Music, movies, narration, [...]").
+      We will need to change this when we distinguish streams by use-case, other
+      possible values being eConsole ("Games, system notification sounds [...]")
+      and eCommunication ("Voice communication"). */
+-  hr = enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, device);
+-  if (FAILED(hr)) {
+-    LOG("Could not get default audio endpoint: %x\n", hr);
+-    SafeRelease(enumerator);
+-    return hr;
+-  }
++  do {
++    hr = enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, device);
++    if (FAILED(hr)) {
++      LOG("Could not get default audio endpoint: %x\n", hr);
++      Sleep(100);
++    }
++  } while (FAILED(hr) && hr != E_NOTFOUND);
+ 
+   SafeRelease(enumerator);
+ 
+   return ERROR_SUCCESS;
+ }
+ 
+ double
+ current_stream_delay(cubeb_stream * stm)

--- a/media/libcubeb/src/cubeb_wasapi.cpp
+++ b/media/libcubeb/src/cubeb_wasapi.cpp
@@ -695,22 +695,23 @@ HRESULT get_default_endpoint(IMMDevice *
   if (FAILED(hr)) {
     LOG("Could not get device enumerator: %x\n", hr);
     return hr;
   }
   /* eMultimedia is okay for now ("Music, movies, narration, [...]").
      We will need to change this when we distinguish streams by use-case, other
      possible values being eConsole ("Games, system notification sounds [...]")
      and eCommunication ("Voice communication"). */
-  hr = enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, device);
-  if (FAILED(hr)) {
-    LOG("Could not get default audio endpoint: %x\n", hr);
-    SafeRelease(enumerator);
-    return hr;
-  }
+  do {
+    hr = enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, device);
+    if (FAILED(hr)) {
+      LOG("Could not get default audio endpoint: %x\n", hr);
+      Sleep(100);
+    }
+  } while (FAILED(hr) && hr != E_NOTFOUND);
 
   SafeRelease(enumerator);
 
   return ERROR_SUCCESS;
 }
 
 double
 current_stream_delay(cubeb_stream * stm)

--- a/media/libcubeb/update.sh
+++ b/media/libcubeb/update.sh
@@ -38,8 +38,10 @@ if [ -n "$rev" ]; then
     echo "WARNING: updating from a dirty git repository."
   fi
   sed -i.bak -e "/The git commit ID used was/ s/[0-9a-f]\{40\}\(-dirty\)\{0,1\}\./$version./" README_MOZILLA
   rm README_MOZILLA.bak
 else
   echo "Remember to update README_MOZILLA with the version details."
 fi
 
+echo "Applying a patch on top of $version."
+patch -p1 < ./retry-device-unavailable.patch