Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed 'ExtensionAttribute' is ambiguous in the namespace 'System.Runt… #73

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions MediaToolkit src/MediaToolkit/CommandBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ private static string GetThumbnail(MediaFile inputFile, MediaFile outputFile, Co
commandBuilder.AppendFormat(" -i \"{0}\" ", inputFile.Filename);
commandBuilder.AppendFormat(" -vframes {0} ", 1);

if (conversionOptions.CustomHeight > 0 && conversionOptions.CustomWidth > 0)
{
commandBuilder.AppendFormat(" -s {0} ", conversionOptions.CustomWidth + "x" + conversionOptions.CustomHeight);
}

return commandBuilder.AppendFormat(" \"{0}\" ", outputFile.Filename).ToString();
}

Expand Down
7 changes: 4 additions & 3 deletions MediaToolkit src/MediaToolkit/MediaToolkit.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MediaToolkit</RootNamespace>
<AssemblyName>MediaToolkit</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
Expand Down Expand Up @@ -52,6 +52,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -96,4 +97,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions MediaToolkit src/MediaToolkit/Util/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@
using System.Globalization;
using System.IO;

namespace System.Runtime.CompilerServices
{
public class ExtensionAttribute : Attribute
{
}
}

namespace MediaToolkit.Util
{
public static class Extensions
public static class Extensions
{
private const int BUFF_SIZE = 16*1024;

Expand Down