From 236e45ae01dcaf5fd1566845d06f5ec1e534fb15 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <larsberg@mozilla.com>
Date: Wed, 3 Aug 2016 10:28:21 -0700
Subject: [PATCH] Add ffmpeg file dependencies to the MSI

---
 support/windows/Servo.wxs.mako | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
index dab08c418ca..e2c83e5708e 100644
--- a/support/windows/Servo.wxs.mako
+++ b/support/windows/Servo.wxs.mako
@@ -113,13 +113,37 @@
                     Name="libfontconfig-1.dll"
                     Source="C:\msys64\mingw64\bin\libfontconfig-1.dll"
                     DiskId="1"/>
-              <File Id="AVUtil"
+              <File Id="AVCodecDll"
+                    Name="avcodec-57.dll"
+                    Source="C:\msys64\mingw64\bin\avcodec-57.dll"
+                    DiskId="1"/>
+              <File Id="AVDeviceDll"
+                    Name="avdevice-57.dll"
+                    Source="C:\msys64\mingw64\bin\avdevice-57.dll"
+                    DiskId="1"/>
+              <File Id="AVFilterDll"
+                    Name="avfilter-6.dll"
+                    Source="C:\msys64\mingw64\bin\avfilter-6.dll"
+                    DiskId="1"/>
+              <File Id="AVFormatDll"
+                    Name="avformat-57.dll"
+                    Source="c:\msys64\mingw64\bin\avformat-57.DLL"
+                    DiskId="1"/>
+              <File Id="AVUtilDll"
                     Name="avutil-55.dll"
                     Source="C:\msys64\mingw64\bin\avutil-55.dll"
                     DiskId="1"/>
-              <File Id="AVFormat"
-                    Name="avformat-57.dll"
-                    Source="C:\msys64\mingw64\bin\avformat-57.dll"
+              <File Id="PostprocDll"
+                    Name="postproc-54.dll"
+                    Source="c:\msys64\mingw64\bin\postproc-54.DLL"
+                    DiskId="1"/>
+              <File Id="SWResampleDll"
+                    Name="swresample-2.dll"
+                    Source="c:\msys64\mingw64\bin\swresample-2.DLL"
+                    DiskId="1"/>
+              <File Id="SWScaleDll"
+                    Name="swscale-4.dll"
+                    Source="c:\msys64\mingw64\bin\swscale-4.DLL"
                     DiskId="1"/>
             </Component>