mirror of
https://github.com/rosenbjerg/FFMpegCore.git
synced 2024-11-10 08:34:12 +01:00
Merge branch 'master' into add-pcm-wrapper
Former-commit-id: e56521b2bb
This commit is contained in:
commit
2bdfcdcb7a
5 changed files with 3 additions and 11 deletions
|
@ -1,5 +1,4 @@
|
||||||
using System;
|
using System;
|
||||||
using FFMpegCore.Enums;
|
|
||||||
using FFMpegCore.Test.Resources;
|
using FFMpegCore.Test.Resources;
|
||||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
using System;
|
namespace FFMpegCore.Test.Resources
|
||||||
using System.IO;
|
|
||||||
using FFMpegCore.Enums;
|
|
||||||
|
|
||||||
namespace FFMpegCore.Test.Resources
|
|
||||||
{
|
{
|
||||||
public enum AudioType
|
public enum AudioType
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
using FFMpegCore.Enums;
|
using FFMpegCore.Enums;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace FFMpegCore.Arguments
|
namespace FFMpegCore.Arguments
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using FFMpegCore.Enums;
|
|
||||||
|
|
||||||
namespace FFMpegCore.Arguments
|
namespace FFMpegCore.Arguments
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,11 +9,11 @@ namespace FFMpegCore.Pipes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class StreamPipeSource : IPipeSource
|
public class StreamPipeSource : IPipeSource
|
||||||
{
|
{
|
||||||
public System.IO.Stream Source { get; }
|
public Stream Source { get; }
|
||||||
public int BlockSize { get; } = 4096;
|
public int BlockSize { get; } = 4096;
|
||||||
public string StreamFormat { get; } = string.Empty;
|
public string StreamFormat { get; } = string.Empty;
|
||||||
|
|
||||||
public StreamPipeSource(System.IO.Stream source)
|
public StreamPipeSource(Stream source)
|
||||||
{
|
{
|
||||||
Source = source;
|
Source = source;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue