diff --git a/.gitignore b/.gitignore
index 202f2b8..5bd6625 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,53 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
+*.userosscache
*.sln.docstates
-# Build results
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+# Build results
[Dd]ebug/
+[Dd]ebugPublic/
[Rr]elease/
+[Rr]eleases/
x64/
-build/
+x86/
+bld/
[Bb]in/
[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
*_i.c
*_p.c
+*_i.h
*.ilk
*.meta
*.obj
@@ -75,21 +67,31 @@ build/
*.vssscc
.builds
*.pidb
-*.log
+*.svclog
*.scc
+# Chutzpah Test files
+_Chutzpah*
+
# Visual C++ cache files
ipch/
*.aps
*.ncb
+*.opendb
*.opensdf
*.sdf
*.cachefile
+*.VC.db
+*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
# Guidance Automation Toolkit
*.gpState
@@ -97,6 +99,10 @@ ipch/
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
# TeamCity is a build add-in
_TeamCity*
@@ -105,8 +111,16 @@ _TeamCity*
*.dotCover
# NCrunch
-*.ncrunch*
+_NCrunch_*
.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
# Installshield output folder
[Ee]xpress/
@@ -125,91 +139,126 @@ DocProject/Help/html
publish/
# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
*.build.csdef
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
# Others
-sql/
-*.Cache
ClientBin/
-[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
-*.[Pp]ublish.xml
+*.dbproj.schemaview
+*.jfm
*.pfx
*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
# RIA/Silverlight projects
Generated_Code/
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
+*.mdf
+*.ldf
-#############
-## Windows detritus
-#############
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
+# Microsoft Fakes
+FakesAssemblies/
-# Folder config file
-Desktop.ini
+# GhostDoc plugin setting file
+*.GhostDoc.xml
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
-# Mac crap
-.DS_Store
+# Visual Studio 6 build log
+*.plg
+# Visual Studio 6 workspace options file
+*.opt
-#############
-## Python
-#############
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
-*.py[co]
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
+# FAKE - F# Make
+.fake/
-# Installer logs
-pip-log.txt
+# JetBrains Rider
+.idea/
+*.sln.iml
-# Unit test / coverage reports
-.coverage
-.tox
+# CodeRush
+.cr/
-#Translations
-*.mo
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
#Mr Developer
.mr.developer.cfg
diff --git a/FFmpeg src/FFmpegLib.zip b/FFmpeg src/FFmpegLib.zip
index c705b05..ce14a1c 100644
Binary files a/FFmpeg src/FFmpegLib.zip and b/FFmpeg src/FFmpegLib.zip differ
diff --git a/FFmpeg src/README.txt b/FFmpeg src/README.txt
index bdb1d8f..bf0810b 100644
--- a/FFmpeg src/README.txt
+++ b/FFmpeg src/README.txt
@@ -1,98 +1,105 @@
-This is a FFmpeg Win32 static build by Kyle Schwarz.
+Zeranoe FFmpeg Builds
-Zeranoe's FFmpeg Builds Home Page:
+Build: ffmpeg-4.0.2-win32-static
-This build was compiled on: , at: 22:01:02
-
-FFmpeg version: 2014-02-04 git-e708424
- libavutil 52. 63.100 / 52. 63.100
- libavcodec 55. 49.101 / 55. 49.101
- libavformat 55. 29.101 / 55. 29.101
- libavdevice 55. 7.100 / 55. 7.100
- libavfilter 4. 1.102 / 4. 1.102
- libswscale 2. 5.101 / 2. 5.101
- libswresample 0. 17.104 / 0. 17.104
- libpostproc 52. 3.100 / 52. 3.100
-
-This FFmpeg build was configured with:
+Configuration:
--enable-gpl
--enable-version3
- --disable-w32threads
- --enable-avisynth
+ --enable-sdl2
--enable-bzlib
--enable-fontconfig
- --enable-frei0r
--enable-gnutls
--enable-iconv
--enable-libass
--enable-libbluray
- --enable-libcaca
--enable-libfreetype
- --enable-libgsm
- --enable-libilbc
- --enable-libmodplug
--enable-libmp3lame
--enable-libopencore-amrnb
--enable-libopencore-amrwb
--enable-libopenjpeg
--enable-libopus
- --enable-librtmp
- --enable-libschroedinger
+ --enable-libshine
+ --enable-libsnappy
--enable-libsoxr
- --enable-libspeex
--enable-libtheora
--enable-libtwolame
- --enable-libvidstab
- --enable-libvo-aacenc
- --enable-libvo-amrwbenc
- --enable-libvorbis
--enable-libvpx
--enable-libwavpack
+ --enable-libwebp
--enable-libx264
- --enable-libxavs
- --enable-libxvid
+ --enable-libx265
+ --enable-libxml2
+ --enable-libzimg
+ --enable-lzma
--enable-zlib
+ --enable-gmp
+ --enable-libvidstab
+ --enable-libvorbis
+ --enable-libvo-amrwbenc
+ --enable-libmysofa
+ --enable-libspeex
+ --enable-libxvid
+ --enable-libaom
+ --enable-libmfx
+ --enable-amf
+ --enable-ffnvcodec
+ --enable-cuvid
+ --enable-d3d11va
+ --enable-nvenc
+ --enable-nvdec
+ --enable-dxva2
+ --enable-avisynth
-This build was compiled with the following external libraries:
- bzip2 1.0.6
- Fontconfig 2.10.95
- Frei0r 20130909-git-10d8360
- GnuTLS 3.2.8.1
- libiconv 1.14
- libass 0.10.2
- libbluray 0.5.0
- libcaca 0.99.beta18
- FreeType 2.5.2
- GSM 1.0.13-4
- iLBC 20120913-git-b5f9b10
- Modplug-XMMS 0.8.8.4
- LAME 3.99.5
- OpenCORE AMR 0.1.3
- OpenJPEG 1.5.1
- Opus 1.1
- RTMPDump 20131205-git-dc76f0a
- Schroedinger 1.0.11
- libsoxr 0.1.1
- Speex 1.2rc1
- Theora 1.1.1
- TwoLAME 0.3.13
- vid.stab 0.98
- VisualOn AAC 0.1.3
- VisualOn AMR-WB 0.1.2
- Vorbis 1.3.4
- vpx 1.3.0
- WavPack 4.70.0
- x264 20140121-git-956c8d8
- XAVS svn-r55
- Xvid 1.3.2
- zlib 1.2.8
-
-The source code for this FFmpeg build can be found at:
+Libraries:
+ SDL 2.0.8
+ bzip2 1.0.6
+ Fontconfig 2.13.0
+ GnuTLS 3.5.19
+ libiconv 1.15
+ libass 0.14.0
+ libbluray 20180309-8c15fda
+ FreeType 2.9.1
+ LAME 3.100
+ OpenCORE AMR 20170731-07a5be4
+ OpenJPEG 2.3.0
+ Opus 20180614-c1c247d
+ shine 3.1.1
+ Snappy 1.1.7
+ libsoxr 20180224-945b592
+ Theora 1.1.1
+ TwoLAME 0.3.13
+ vpx 1.7.0
+ WavPack 5.1.0
+ WebP 1.0.0
+ x264 20180118-7d0ff22
+ x265 20180725-79c76e4
+ libxml2 2.9.8
+ z.lib 20180713-654c15b
+ XZ Utils 5.2.4
+ zlib 1.2.11
+ GMP 6.1.2
+ vid.stab 20180529-38ecbaf
+ Vorbis 1.3.5
+ VisualOn AMR-WB 20141107-3b3fcd0
+ libmysofa 20171120-cec6eea
+ Speex 1.2.0
+ Xvid 1.3.5
+ aom 20180725-b0c13b2
+ libmfx 1.23
+ AMF 20171219-801247d
+ nv-codec-headers 20180507-91d9e20
-This build was compiled on Debian jessie/sid (64-bit):
+Copyright (C) 2018 Kyle Schwarz
-GCC 4.8.2 was used to compile this FFmpeg build:
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
-This build was compiled using the MinGW-w64 toolchain:
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
-Licenses for each library can be found in the 'licenses' folder.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
\ No newline at end of file
diff --git a/MediaToolkit src/MediaToolkit.Test/ConvertTest.cs b/MediaToolkit src/MediaToolkit.Test/ConvertTest.cs
index 7069a9d..2180389 100644
--- a/MediaToolkit src/MediaToolkit.Test/ConvertTest.cs
+++ b/MediaToolkit src/MediaToolkit.Test/ConvertTest.cs
@@ -11,7 +11,7 @@ namespace MediaToolkit.Test
[TestFixture]
public class ConvertTest
{
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void Init()
{
// Raise progress events?
@@ -29,8 +29,7 @@ public void Init()
return;
}
-
- var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
+ var directoryInfo = new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
Debug.Assert(directoryInfo.Parent != null, "directoryInfo.Parent != null");
DirectoryInfo testDirectoryInfo = directoryInfo.Parent.Parent;
@@ -74,7 +73,7 @@ public void Can_CutVideo()
engine.Convert(inputFile, outputFile, options);
engine.GetMetadata(outputFile);
}
-
+
Assert.That(File.Exists(outputPath));
// Input file is 33 seconds long, seeking to the 30th second and then
// attempting to cut another 25 seconds isn't possible as there's only 3 seconds
diff --git a/MediaToolkit src/MediaToolkit.Test/MediaToolkit.Test.csproj b/MediaToolkit src/MediaToolkit.Test/MediaToolkit.Test.csproj
index eeb9d24..30fb5fe 100644
--- a/MediaToolkit src/MediaToolkit.Test/MediaToolkit.Test.csproj
+++ b/MediaToolkit src/MediaToolkit.Test/MediaToolkit.Test.csproj
@@ -1,5 +1,6 @@

+
Debug
@@ -11,6 +12,8 @@
MediaToolkit.Test
v4.5
512
+
+
true
@@ -39,15 +42,24 @@
MinimumRecommendedRules.ruleset
-
- ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll
- True
+
+ ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll
-
- ..\packages\NUnit.2.6.3\lib\nunit.framework.dll
+
+ ..\packages\Moq.4.9.0\lib\net45\Moq.dll
+
+
+ ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll
+
+
+ ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
+
+
+ ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
+
@@ -72,6 +84,12 @@
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+