Adjust gstreamer plugins for UWP.

4 files changed, 76 insertions, 462 deletions

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 6f7c0228524..e3f5e10e758 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -135,7 +135,7 @@ mod media_platform {
         let mut plugin_dir = std::env::current_exe().unwrap();
         plugin_dir.pop();
 
-        let plugins = &[
+        let uwp_plugins = [
             "gstapp.dll",
             "gstaudioconvert.dll",
             "gstaudiofx.dll",
@@ -144,31 +144,49 @@ mod media_platform {
             "gstautodetect.dll",
             "gstcoreelements.dll",
             "gstdeinterlace.dll",
-            "gstplayback.dll",
             "gstinterleave.dll",
             "gstisomp4.dll",
             "gstlibav.dll",
-            "gstnice.dll",
-            "gstogg.dll",
-            "gstopengl.dll",
-            "gstopus.dll",
+            "gstplayback.dll",
             "gstproxy.dll",
-            "gstrtp.dll",
-            "gsttheora.dll",
             "gsttypefindfunctions.dll",
             "gstvideoconvert.dll",
             "gstvideofilter.dll",
             "gstvideoparsersbad.dll",
             "gstvideoscale.dll",
             "gstvolume.dll",
+            "gstwasapi.dll",
+        ];
+
+        let non_uwp_plugins = [
+            "gstnice.dll",
+            "gstogg.dll",
+            "gstopengl.dll",
+            "gstopus.dll",
+            "gstrtp.dll",
+            "gsttheora.dll",
             "gstvorbis.dll",
             "gstvpx.dll",
-            "gstwasapi.dll",
             "gstwebrtc.dll",
         ];
 
-        let backend = GStreamerBackend::init_with_plugins(plugin_dir, plugins)
-            .expect("Error initializing GStreamer");
+        let plugins: Vec<_> = if cfg!(feature = "uwp") {
+            uwp_plugins.to_vec()
+        } else {
+            uwp_plugins
+                .iter()
+                .map(|&s| s)
+                .chain(non_uwp_plugins.iter().map(|&s| s))
+                .collect()
+        };
+
+        let backend = match GStreamerBackend::init_with_plugins(plugin_dir, &plugins) {
+            Ok(b) => b,
+            Err(e) => {
+                error!("Error initializing GStreamer: {:?}", e);
+                panic!()
+            },
+        };
         ServoMedia::init_with_backend(backend);
     }
 
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 53354f3d73a..4d9268175c0 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -606,7 +606,7 @@ class MachCommands(CommandBase):
                 target_triple = target or host_triple()
                 if "aarch64" not in target_triple:
                     print("Packaging gstreamer DLLs")
-                    if not package_gstreamer_dlls(servo_exe_dir, target_triple):
+                    if not package_gstreamer_dlls(servo_exe_dir, target_triple, uwp):
                         status = 1
                 print("Packaging MSVC DLLs")
                 if not package_msvc_dlls(servo_exe_dir, target_triple):
@@ -658,7 +658,7 @@ class MachCommands(CommandBase):
         return check_call(["cargo", "clean"] + opts, env=self.build_env(), verbose=verbose)
 
 
-def package_gstreamer_dlls(servo_exe_dir, target):
+def package_gstreamer_dlls(servo_exe_dir, target, uwp):
     msvc_x64 = "64" if "x86_64" in target else ""
     gst_x64 = "X86_64" if msvc_x64 == "64" else "X86"
     gst_root = ""
@@ -684,7 +684,6 @@ def package_gstreamer_dlls(servo_exe_dir, target):
         "glib-2.0-0.dll",
         "gmodule-2.0-0.dll",
         "gobject-2.0-0.dll",
-        "graphene-1.0-0.dll",
         "gstapp-1.0-0.dll",
         "gstaudio-1.0-0.dll",
         "gstbase-1.0-0.dll",
@@ -697,33 +696,42 @@ def package_gstreamer_dlls(servo_exe_dir, target):
         "gstreamer-1.0-0.dll",
         "gstriff-1.0-0.dll",
         "gstrtp-1.0-0.dll",
-        "gstsctp-1.0-0.dll",
         "gstsdp-1.0-0.dll",
         "gsttag-1.0-0.dll",
         "gstvideo-1.0-0.dll",
         "gstwebrtc-1.0-0.dll",
         "intl-8.dll",
-        "libgmp-10.dll",
-        "libgnutls-30.dll",
-        "libhogweed-4.dll",
-        "libjpeg-8.dll",
-        "libnettle-6.dll.",
-        "libpng16-16.dll",
-        "libogg-0.dll",
-        "libopus-0.dll",
-        "libtasn1-6.dll",
-        "libtheora-0.dll",
-        "libtheoradec-1.dll",
-        "libtheoraenc-1.dll",
-        "libvorbis-0.dll",
-        "libvorbisenc-2.dll",
-        "libwinpthread-1.dll",
-        "nice-10.dll",
         "orc-0.4-0.dll",
         "swresample-3.dll",
         "z-1.dll",
     ]
 
+    # FIXME: until we build with UWP-enabled GStreamer binaries,
+    #        almost every UWP-friendly DLL depends on this
+    #        incompatible DLL.
+    gst_dlls += ["libwinpthread-1.dll"]
+
+    if not uwp:
+        gst_dlls += [
+            "graphene-1.0-0.dll",
+            "gstsctp-1.0-0.dll",
+            "libgmp-10.dll",
+            "libgnutls-30.dll",
+            "libhogweed-4.dll",
+            "libjpeg-8.dll",
+            "libnettle-6.dll.",
+            "libogg-0.dll",
+            "libopus-0.dll",
+            "libpng16-16.dll",
+            "libtasn1-6.dll",
+            "libtheora-0.dll",
+            "libtheoradec-1.dll",
+            "libtheoraenc-1.dll",
+            "libvorbis-0.dll",
+            "libvorbisenc-2.dll",
+            "nice-10.dll",
+        ]
+
     missing = []
     for gst_lib in gst_dlls:
         try:
@@ -749,26 +757,30 @@ def package_gstreamer_dlls(servo_exe_dir, target):
         "gstplayback.dll",
         "gstinterleave.dll",
         "gstisomp4.dll",
-        "gstnice.dll",
-        "gstogg.dll",
-        "gstopengl.dll",
-        "gstopus.dll",
+        "gstlibav.dll",
         "gstproxy.dll",
-        "gstrtp.dll",
-        "gsttheora.dll",
         "gsttypefindfunctions.dll",
         "gstvideoconvert.dll",
         "gstvideofilter.dll",
         "gstvideoparsersbad.dll",
         "gstvideoscale.dll",
         "gstvolume.dll",
-        "gstvorbis.dll",
-        "gstvpx.dll",
-        "gstwebrtc.dll",
         "gstwasapi.dll",
-        "gstlibav.dll",
     ]
 
+    if not uwp:
+        gst_dlls += [
+            "gstnice.dll",
+            "gstogg.dll",
+            "gstopengl.dll",
+            "gstopus.dll",
+            "gstrtp.dll",
+            "gsttheora.dll",
+            "gstvorbis.dll",
+            "gstvpx.dll",
+            "gstwebrtc.dll",
+        ]
+
     gst_plugin_path_root = os.environ.get("GSTREAMER_PACKAGE_PLUGIN_PATH") or gst_root
     gst_plugin_path = path.join(gst_plugin_path_root, "lib", "gstreamer-1.0")
     if not os.path.exists(gst_plugin_path):
diff --git a/support/hololens/ServoApp.vcxproj b/support/hololens/ServoApp.vcxproj
index 0d3fd0d3de8..147a3544ce4 100644
--- a/support/hololens/ServoApp.vcxproj
+++ b/support/hololens/ServoApp.vcxproj
@@ -154,9 +154,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\target\debug\api-ms-win-crt-runtime-l1-1-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DeploymentContent>
     </None>
     <None Include="..\..\target\debug\avcodec-58.dll">
       <DeploymentContent>false</DeploymentContent>
@@ -208,11 +208,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\graphene-1.0-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\gstapp-1.0-0.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -303,26 +298,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\gstnice.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\gstogg.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\gstopengl.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\gstopus.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\gstpbutils-1.0-0.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -358,16 +333,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\gstrtp.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\gstsctp-1.0-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\gstsdp-1.0-0.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -378,11 +343,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\gsttheora.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\gsttypefindfunctions.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -418,16 +378,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\gstvorbis.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\gstvpx.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\gstwasapi.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -438,11 +388,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\gstwebrtc.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\intl-8.dll">
       <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -453,90 +398,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\debug\libgmp-10.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libgnutls-30.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libhogweed-4.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libjpeg-8.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libnettle-6.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libogg-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libopus-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libpng16-16.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libtasn1-6.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libtheora-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libtheoradec-1.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libtheoraenc-1.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libvorbis-0.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\libvorbisenc-2.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\debug\libwinpthread-1.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DeploymentContent>
     </None>
     <None Include="..\..\target\debug\msvcp140.dll">
-      <DeploymentContent>false</DeploymentContent>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\debug\nice-10.dll">
-      <DeploymentContent>false</DeploymentContent>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DeploymentContent>
     </None>
     <None Include="..\..\target\debug\orc-0.4-0.dll">
       <DeploymentContent>false</DeploymentContent>
@@ -623,11 +493,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\graphene-1.0-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\gstapp-1.0-0.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -718,26 +583,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\gstnice.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\gstogg.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\gstopengl.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\gstopus.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\gstpbutils-1.0-0.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -773,16 +618,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\gstrtp.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\gstsctp-1.0-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\gstsdp-1.0-0.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -793,11 +628,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\gsttheora.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\gsttypefindfunctions.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -833,16 +663,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\gstvorbis.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\gstvpx.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\gstwasapi.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -853,11 +673,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\gstwebrtc.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\intl-8.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -868,76 +683,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\libgmp-10.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libgnutls-30.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libhogweed-4.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libjpeg-8.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libnettle-6.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libogg-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libopus-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libpng16-16.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libtasn1-6.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libtheora-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libtheoradec-1.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libtheoraenc-1.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libvorbis-0.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\target\release\libvorbisenc-2.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\libwinpthread-1.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
@@ -948,11 +693,6 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\target\release\nice-10.dll">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\target\release\orc-0.4-0.dll">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DeploymentContent>
diff --git a/support/hololens/ServoApp.vcxproj.filters b/support/hololens/ServoApp.vcxproj.filters
index 119284d32ce..4c6df91920a 100644
--- a/support/hololens/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp.vcxproj.filters
@@ -88,9 +88,6 @@
     <None Include="..\..\target\debug\gobject-2.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\graphene-1.0-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstapp.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
@@ -145,18 +142,6 @@
     <None Include="..\..\target\debug\gstlibav.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gstnice.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\gstogg.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\gstopengl.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\gstopus.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstpbutils-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
@@ -175,24 +160,15 @@
     <None Include="..\..\target\debug\gstriff-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gstrtp.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstrtp-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gstsctp-1.0-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstsdp-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
     <None Include="..\..\target\debug\gsttag-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gsttheora.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gsttypefindfunctions.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
@@ -214,18 +190,9 @@
     <None Include="..\..\target\debug\gstvolume.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gstvorbis.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\gstvpx.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstwasapi.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\gstwebrtc.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\gstwebrtc-1.0-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
@@ -235,57 +202,12 @@
     <None Include="..\..\target\debug\libeay32.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\libgmp-10.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libgnutls-30.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libhogweed-4.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libjpeg-8.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libnettle-6.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libogg-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libopus-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libpng16-16.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libtasn1-6.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libtheora-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libtheoradec-1.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libtheoraenc-1.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libvorbis-0.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
-    <None Include="..\..\target\debug\libvorbisenc-2.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\libwinpthread-1.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
     <None Include="..\..\target\debug\msvcp140.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
-    <None Include="..\..\target\debug\nice-10.dll">
-      <Filter>ServoDLLsDebug</Filter>
-    </None>
     <None Include="..\..\target\debug\orc-0.4-0.dll">
       <Filter>ServoDLLsDebug</Filter>
     </None>
@@ -334,9 +256,6 @@
     <None Include="..\..\target\release\gobject-2.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\graphene-1.0-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstapp.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
@@ -391,18 +310,6 @@
     <None Include="..\..\target\release\gstlibav.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gstnice.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\gstogg.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\gstopengl.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\gstopus.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstpbutils-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
@@ -421,24 +328,15 @@
     <None Include="..\..\target\release\gstriff-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gstrtp.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstrtp-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gstsctp-1.0-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstsdp-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
     <None Include="..\..\target\release\gsttag-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gsttheora.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gsttypefindfunctions.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
@@ -460,18 +358,9 @@
     <None Include="..\..\target\release\gstvolume.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gstvorbis.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\gstvpx.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstwasapi.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\gstwebrtc.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\gstwebrtc-1.0-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
@@ -481,57 +370,12 @@
     <None Include="..\..\target\release\libeay32.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\libgmp-10.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libgnutls-30.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libhogweed-4.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libjpeg-8.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libnettle-6.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libogg-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libopus-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libpng16-16.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libtasn1-6.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libtheora-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libtheoradec-1.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libtheoraenc-1.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libvorbis-0.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
-    <None Include="..\..\target\release\libvorbisenc-2.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\libwinpthread-1.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
     <None Include="..\..\target\release\msvcp140.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>
-    <None Include="..\..\target\release\nice-10.dll">
-      <Filter>ServoDLLsRelease</Filter>
-    </None>
     <None Include="..\..\target\release\orc-0.4-0.dll">
       <Filter>ServoDLLsRelease</Filter>
     </None>