From 5721cd14532068d482a072ed683090f05d90e7d3 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 30 Mar 2014 20:02:48 -0700
Subject: [PATCH] Update ffms2

---
 build/ffms2/ffms2.vcxproj         | 12 ++++++++--
 build/ffms2/ffms2.vcxproj.filters | 38 +++++++++++++++++++++++++------
 vendor/ffms2                      |  2 +-
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj
index 7b3759d88..df3c2c514 100644
--- a/build/ffms2/ffms2.vcxproj
+++ b/build/ffms2/ffms2.vcxproj
@@ -56,7 +56,9 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\audiosource.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\codectype.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\ffms.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haaliaudio.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haaliindexer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haalivideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp" />
@@ -66,13 +68,15 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaaudio.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaindexer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaparser.c" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskareader.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskavideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\stdiostream.c" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videoutils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\wave64writer.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(FfmsSrcDir)\include\ffms.h" />
@@ -85,15 +89,19 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\audiosource.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\codectype.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\coparser.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\guids.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\indexing.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\matroskaparser.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\stdiostream.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\track.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videosource.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videoutils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\wave64writer.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\vapoursource.h" />
   </ItemGroup>
diff --git a/build/ffms2/ffms2.vcxproj.filters b/build/ffms2/ffms2.vcxproj.filters
index fc32f56df..82b4bd274 100644
--- a/build/ffms2/ffms2.vcxproj.filters
+++ b/build/ffms2/ffms2.vcxproj.filters
@@ -75,9 +75,6 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\stdiostream.c">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -108,6 +105,21 @@
     <None Include="$(FfmsSrcDir)\src\vapoursynth\vapoursynth.cpp">
       <Filter>VapourSynth</Filter>
     </None>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskareader.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp">
+      <Filter>Indexing</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(FfmsSrcDir)\src\core\audiosource.h">
@@ -140,9 +152,6 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\stdiostream.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -173,5 +182,20 @@
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h">
       <Filter>VapourSynth</Filter>
     </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\track.h">
+      <Filter>Indexing</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vendor/ffms2 b/vendor/ffms2
index 27c1efd4c..73e431a21 160000
--- a/vendor/ffms2
+++ b/vendor/ffms2
@@ -1 +1 @@
-Subproject commit 27c1efd4c67f9bc0b4d05d0f1993ef3b45c435f8
+Subproject commit 73e431a2112019a96623f459c23ed197b70d0c04