Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nixxquality/FFMSSharp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: nixxquality/FFMSSharp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on May 2, 2014

  1. Copy the full SHA
    6d4dae3 View commit details
  2. Indexer.Index throws C# exceptions

    See #1
    nixxquality committed May 2, 2014
    Copy the full SHA
    cfa1b03 View commit details
  3. Copy the full SHA
    a7f81ae View commit details
  4. Copy the full SHA
    be19cd3 View commit details
  5. Copy the full SHA
    1f1a52f View commit details
  6. Copy the full SHA
    9497b41 View commit details
  7. Copy the full SHA
    c2d70bb View commit details
  8. VideoSource.SetInputFormat throws C# exceptions

    See #1
    
    There is no test for this one, because I don't know how to actually make
    it error. How insane does it have to be!?
    nixxquality committed May 2, 2014
    Copy the full SHA
    852a1e0 View commit details
  9. VideoSource.GetFrame throws C# exceptions

    See #1
    
    I don't know what exceptions these two can throw -- if any.
    nixxquality committed May 2, 2014
    Copy the full SHA
    3d45615 View commit details
  10. AudioSource.GetAudio throws C# exceptions

    See #1
    
    No test for this one either; I don't have any test file with "severely
    broken seeking."
    nixxquality committed May 2, 2014
    Copy the full SHA
    29145ff View commit details
  11. Bye bye, ErrorHandling.cs

    Fixes #1
    nixxquality committed May 2, 2014
    Copy the full SHA
    123f593 View commit details
  12. FFMSsharp -> FFMSSharp

    The result of another Code Analysis pass.
    nixxquality committed May 2, 2014
    Copy the full SHA
    52744ad View commit details

Commits on May 3, 2014

  1. Copy the full SHA
    7f044c1 View commit details

Commits on May 16, 2014

  1. 1
    Copy the full SHA
    b0ff7b9 View commit details
  2. Index.WriteIndex supports UTF-8 paths

    Have to do this in a kind of weird order, because of how the tests work
    together.
    
    See #6 and #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    74fdae2 View commit details
  3. Index.Index(string) supports UTF-8 paths

    See #6 and #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    16df64d View commit details
  4. Index.BelongsToFile supports UTF-8 paths

    See #6 and #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    b3d5191 View commit details
  5. Index.VideoSource supports UTF-8 paths

    See #6 and #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    979ffa3 View commit details
  6. Index.AudioSource supports UTF-8 paths

    See #6 and #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    a84df10 View commit details
  7. Track.WriteTimecodes supports UTF-8 paths

    Fixes #6.
    
    See #8.
    nixxquality committed May 16, 2014
    Copy the full SHA
    f25b7d8 View commit details
  8. FFMS_GetPixFmt string marshaling

    All that's left now to take care of this issue is to completely deal
    with audio dumping.
    
    See #8 and #4.
    nixxquality committed May 16, 2014
    Copy the full SHA
    a000930 View commit details
  9. Copy the full SHA
    eb745f3 View commit details
  10. Copy the full SHA
    4aff0fc View commit details
  11. Copy the full SHA
    518b14a View commit details

Commits on May 19, 2014

  1. Update README.md

    [skip ci]
    nixxquality committed May 19, 2014
    Copy the full SHA
    2b749e8 View commit details
  2. Test improvements

    [skip ci]
    nixxquality committed May 19, 2014
    Copy the full SHA
    22bb756 View commit details
  3. Index now complies with CA2006

    See #10
    nixxquality committed May 19, 2014
    Copy the full SHA
    66855c0 View commit details
  4. Indexer now complies with CA2006

    Fixes #10
    nixxquality committed May 19, 2014
    Copy the full SHA
    dffa438 View commit details
  5. Copy the full SHA
    c87f11f View commit details
  6. Fix CS0649 warnings

    nixxquality committed May 19, 2014
    Copy the full SHA
    85ecc80 View commit details
  7. Copy the full SHA
    eb370b8 View commit details
  8. Copy the full SHA
    505ecd1 View commit details
  9. Copy the full SHA
    a269283 View commit details
  10. Copy the full SHA
    ecffeb2 View commit details
  11. Remove the broken test

    nixxquality committed May 19, 2014
    Copy the full SHA
    36cc1dd View commit details

Commits on May 20, 2014

  1. Copy the full SHA
    eca8801 View commit details
  2. Copy the full SHA
    35bac99 View commit details
  3. Fix documentation after 35bac99

    [skip ci]
    nixxquality committed May 20, 2014
    Copy the full SHA
    310030c View commit details
  4. Audio dumping is in (fixes #4)

    Please note that audio dumping seems to be broken in upstream ffms2.
    It works if you use the 2.17 dll.
    nixxquality committed May 20, 2014
    Copy the full SHA
    d51d5dc View commit details
  5. Copy the full SHA
    6964e18 View commit details
  6. Bump version

    [skip ci]
    nixxquality committed May 20, 2014
    Copy the full SHA
    c576b5c View commit details

Commits on May 21, 2014

  1. Add an FFMS2 error case

    nixxquality committed May 21, 2014
    Copy the full SHA
    d2822ec View commit details

Commits on May 22, 2014

  1. Bump version and add nuspec

    [skip ci]
    nixxquality committed May 22, 2014
    Copy the full SHA
    90d323d View commit details
  2. Ignore any ffms2 dlls you might have

    [skip ci]
    nixxquality committed May 22, 2014
    Copy the full SHA
    8fe3c4c View commit details

Commits on Jan 24, 2015

  1. Copy the full SHA
    e49f5f6 View commit details
  2. Copy the full SHA
    13da3dc View commit details
  3. ReSharper'ed

    InconsistentNaming warnings are disabled for all internal things that
    just exist for interop purposes.
    nixxquality committed Jan 24, 2015
    Copy the full SHA
    e2d4bcc View commit details

Commits on Feb 7, 2016

  1. Update README.md

    nixxquality committed Feb 7, 2016
    Copy the full SHA
    04845e6 View commit details
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -177,5 +177,5 @@ FakesAssemblies/
Sandcastle/

# Binary test files
FFMSsharp.Tests/ffms2.dll
FFMSsharp.Tests/ffms2*.dll
FFMSsharp.Tests/*mkv
4 changes: 2 additions & 2 deletions FFMSsharp.sln → FFMSSharp.sln
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSsharp", "FFMSsharp\FFMSsharp.csproj", "{303CA7DC-1B7E-45BE-9A90-A37D72CE4791}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSSharp", "FFMSsharp\FFMSSharp.csproj", "{303CA7DC-1B7E-45BE-9A90-A37D72CE4791}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSsharp.Tests", "FFMSsharp.Tests\FFMSsharp.Tests.csproj", "{04F8F954-CEF5-4E80-B134-68C99584B338}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSSharp.Tests", "FFMSsharp.Tests\FFMSSharp.Tests.csproj", "{04F8F954-CEF5-4E80-B134-68C99584B338}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5 changes: 5 additions & 0 deletions FFMSSharp.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AV/@EntryIndexedValue">AV</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FFMS/@EntryIndexedValue">FFMS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FPS/@EntryIndexedValue">FPS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RFF/@EntryIndexedValue">RFF</s:String></wpf:ResourceDictionary>
6 changes: 3 additions & 3 deletions FFMSsharp.Tests/FFMSsharp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -57,9 +57,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FFMSsharp\FFMSsharp.csproj">
<ProjectReference Include="..\FFMSsharp\FFMSSharp.csproj">
<Project>{303ca7dc-1b7e-45be-9a90-a37d72ce4791}</Project>
<Name>FFMSsharp</Name>
<Name>FFMSSharp</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -72,7 +72,7 @@
<Content Include="h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="samples.dat, how to verify.jpg">
<Content Include="おはよう.mkv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
6 changes: 3 additions & 3 deletions FFMSsharp.Tests/Requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Download these two files from http://www.auby.no/files/video_tests/ :
- h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv
- h264_720p_hp_3.1_600kbps_aac_mp3_dual_audio_harry_potter.mkv
Download these two files:
- http://nixx.is-fantabulo.us/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv
- http://nixx.is-fantabulo.us/h264_720p_hp_3.1_600kbps_aac_mp3_dual_audio_harry_potter.mkv

Download and extract ffms2.dll from :
- https://github.com/FFMS/ffms2/releases
Loading