mirror of
https://github.com/QL-Win/QuickLook.git
synced 2025-09-12 10:19:07 +00:00
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:
@@ -59,8 +59,14 @@
|
|||||||
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ffme">
|
<Reference Include="ffme.common">
|
||||||
<HintPath>References\ffme.dll</HintPath>
|
<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>
|
||||||
<Reference Include="policy.2.0.taglib-sharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
|
<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>
|
<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">
|
<Content Include="ffmpeg\x64\ffprobe.exe">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="ffmpeg\x64\postproc-54.dll">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="ffmpeg\x64\swresample-2.dll">
|
<Content Include="ffmpeg\x64\swresample-2.dll">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
@@ -165,6 +174,9 @@
|
|||||||
<Content Include="ffmpeg\x86\ffprobe.exe">
|
<Content Include="ffmpeg\x86\ffprobe.exe">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="ffmpeg\x86\postproc-54.dll">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="ffmpeg\x86\swresample-2.dll">
|
<Content Include="ffmpeg\x86\swresample-2.dll">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
Binary file not shown.
Binary file not shown.
@@ -3,7 +3,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:ffme="clr-namespace:Unosquare.FFME;assembly=ffme"
|
xmlns:ffme="clr-namespace:Unosquare.FFME;assembly=ffme.win"
|
||||||
xmlns:local="clr-namespace:QuickLook.Plugin.VideoViewer"
|
xmlns:local="clr-namespace:QuickLook.Plugin.VideoViewer"
|
||||||
xmlns:glassLayer="clr-namespace:QuickLook.Controls.GlassLayer;assembly=QuickLook"
|
xmlns:glassLayer="clr-namespace:QuickLook.Controls.GlassLayer;assembly=QuickLook"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
|
@@ -74,7 +74,7 @@ namespace QuickLook.Plugin.VideoViewer
|
|||||||
{
|
{
|
||||||
if (_wasPlaying) mediaElement.Play();
|
if (_wasPlaying) mediaElement.Play();
|
||||||
};
|
};
|
||||||
mediaElement.MediaFailed += ShowErrorNotification;
|
//mediaElement.MediaFailed += ShowErrorNotification;
|
||||||
mediaElement.MediaOpening += (sender, e) => e.Options.EnableHardwareAcceleration = true;
|
mediaElement.MediaOpening += (sender, e) => e.Options.EnableHardwareAcceleration = true;
|
||||||
/*mediaElement.MediaEnded += (s, e) =>
|
/*mediaElement.MediaEnded += (s, e) =>
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
BIN
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ffme/ffme.win.dll
Normal file
BIN
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ffme/ffme.win.dll
Normal file
Binary file not shown.
3065
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ffme/ffme.win.xml
Normal file
3065
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ffme/ffme.win.xml
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user