Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create a FFmpeg redist package (for win-x64) (#158)
* ffmpeg redist package * ci
- Loading branch information
1 parent
21af9a4
commit 6c53dde
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <PackageId>$(AssemblyName)</PackageId> | ||
| <Version>4.3.1</Version> | ||
| <Authors>Ruslan Balanukhin</Authors> | ||
| <Company>Rational Core</Company> | ||
| <Product>FFmpeg.AutoGen</Product> | ||
| <Copyright>Copyright © Ruslan Balanukhin 2020 All rights reserved.</Copyright> | ||
| <PackageProjectUrl>https://github.com/Ruslan-B/FFmpeg.AutoGen</PackageProjectUrl> | ||
| <AssemblyVersion>$(Version)</AssemblyVersion> | ||
| <FileVersion>$(Version)</FileVersion> | ||
| <PackageTags>ffmpeg</PackageTags> | ||
| <PackageLicenseFile>LICENSE.txt</PackageLicenseFile> | ||
| <GeneratePackageOnBuild>false</GeneratePackageOnBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> | ||
| <SignAssembly>true</SignAssembly> | ||
| <DelaySign>false</DelaySign> | ||
| <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)FFmpeg.AutoGen.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <LangVersion>latest</LangVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="$(MSBuildThisFileDirectory)LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>netstandard2.0;net40</TargetFrameworks> | ||
| <GeneratePackageOnBuild Condition=" $(Configuration) == 'Release' ">true</GeneratePackageOnBuild> | ||
| <Description>FFmpeg win-x64 redistribution package, use together with FFmpeg.AutoGen package.</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="build.props"> | ||
| <PackagePath>build\net40\$(PackageId).props</PackagePath> | ||
| <Pack>true</Pack> | ||
| </Content> | ||
| <Content Include="../FFmpeg/bin/x64/*.dll"> | ||
| <PackagePath>runtimes\win-x64\native\%(filename).dll</PackagePath> | ||
| <Pack>true</Pack> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*.dll"> | ||
| <Link>%(Filename)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,9 +49,10 @@ static ffmpeg() | |
|
|
||
| /// <summary> | ||
| /// Gets or sets the root path for loading libraries. | ||
| /// Work out of box with companion ffmpeg distribution package like FFmpeg.AutoGen.Redist.windows.x64 | ||
| /// </summary> | ||
| /// <value>The root path.</value> | ||
| public static string RootPath { get; set; } = AppDomain.CurrentDomain.BaseDirectory; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
hanabi1224
Author
Contributor
|
||
|
|
||
| public static GetOrLoadLibrary GetOrLoadLibrary { get; set; } | ||
|
|
||
|
|
@@ -92,7 +93,7 @@ public static int AVERROR<T1>(T1 a) | |
| => -Convert.ToInt32(a); | ||
|
|
||
| public static int MKTAG<T1, T2, T3, T4>(T1 a, T2 b, T3 c, T4 d) | ||
| => (int)(Convert.ToUInt32(a) | (Convert.ToUInt32(b) << 8) | (Convert.ToUInt32(c) << 16) | | ||
| (Convert.ToUInt32(d) << 24)); | ||
|
|
||
| public static int FFERRTAG<T1, T2, T3, T4>(T1 a, T2 b, T3 c, T4 d) | ||
|
|
||
Note that this change breaks ASP.NET applications because BaseDirectory points to "webapp" but not "webapp\bin"