fix #115 and #129: use FFmpeg 3.4.0 GPL libs, use ffme 2.0.b9 with patch unosquare/ffmediaelement#147 and autogen 3.4.0.2

This commit is contained in:
Paddy Xu
2018-01-24 23:01:00 +02:00
parent 76dd2feb30
commit c1bcf311bc
31 changed files with 11163 additions and 5988 deletions

View File

@@ -59,8 +59,14 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ffme">
<HintPath>References\ffme.dll</HintPath>
<Reference Include="ffme.common">
<HintPath>ffme\ffme.common.dll</HintPath>
</Reference>
<Reference Include="ffme.win">
<HintPath>ffme\ffme.win.dll</HintPath>
</Reference>
<Reference Include="FFmpeg.AutoGen">
<HintPath>ffme\FFmpeg.AutoGen.dll</HintPath>
</Reference>
<Reference Include="policy.2.0.taglib-sharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
<HintPath>..\..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
@@ -138,6 +144,9 @@
<Content Include="ffmpeg\x64\ffprobe.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ffmpeg\x64\postproc-54.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ffmpeg\x64\swresample-2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -165,6 +174,9 @@
<Content Include="ffmpeg\x86\ffprobe.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ffmpeg\x86\postproc-54.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ffmpeg\x86\swresample-2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>