Commit graph

133 commits

Author SHA1 Message Date
Malte Rosenbjerg
390cd00005 Minor fixes
Former-commit-id: 1b67ea76f0
2021-10-21 19:43:13 +02:00
alex6dj
21da31c4c1 Fixed error when burning subtitle with some special charaters in path
Former-commit-id: e6e07fc2fe
2021-10-01 23:40:40 -04:00
Fedor Zhilkin
737654256c Merge branch 'master' of github.com:Feodoros/FFMpegCore
Former-commit-id: c540819893
2021-08-11 15:55:40 +03:00
Fedor Zhilkin
847ed70522 Fix params order
Former-commit-id: 86ea16c432
2021-08-11 15:54:58 +03:00
Malte Rosenbjerg
f7dfc6106c Merge branch 'master' into master
Former-commit-id: fc9db2c04a
2021-08-11 00:43:03 +02:00
Fedor Zhilkin
65ebc57b29 Nullable streamIndex and inputFileIndex
Former-commit-id: 562a50d874
2021-08-11 01:21:06 +03:00
Malte Rosenbjerg
1f3d1ec429 Move Loop(1) to image FileInput. Fix for #206
Former-commit-id: 914003ee32
2021-08-07 14:40:58 +02:00
Malte Rosenbjerg
4c521aadcc Merge branch 'master' into master
Former-commit-id: 3888a07ab2
2021-08-06 08:10:37 +02:00
alex6dj
8633937f52 Use long option for stream index for better clarity
Former-commit-id: 14d457b946
2021-08-05 15:14:37 -04:00
alex6dj
75386b6dac Document parameters
Former-commit-id: 6247bf6ea4
2021-08-05 15:11:23 -04:00
alex6dj
96ec0613d3 Subtitle hard-burn implementation.
Former-commit-id: 3a89062384
2021-08-05 14:37:32 -04:00
Fedor Zhilkin
074404f08c Style guide fixes and minor refactoring
Former-commit-id: c30cf4c7ad
2021-08-03 21:58:40 +03:00
Fedor Zhilkin
8b5b6d8e79 Merge branch 'master' of github.com:rosenbjerg/FFMpegCore
Former-commit-id: 37109bab34
2021-08-03 21:57:30 +03:00
Patrick Krämer
0ba18c24ae Support cancellation token for cancelling FFMPEG processes
Former-commit-id: 3efc34565a
2021-07-07 20:16:14 +02:00
Malte Rosenbjerg
bf020a7893 Merge branch 'master' into add-pcm-wrapper
Former-commit-id: f8692abc57
2021-06-08 18:55:09 +02:00
Malte Rosenbjerg
d9ef2f5d54 Remove -y
Former-commit-id: 366a1cd6c0
2021-06-08 18:49:22 +02:00
Julien Loir
7e9b3d20cd Add test for the new audio pipe
Former-commit-id: acd462a527
2021-05-25 16:14:40 +02:00
Malte Rosenbjerg
2bdfcdcb7a Merge branch 'master' into add-pcm-wrapper
Former-commit-id: e56521b2bb
2021-05-15 11:17:46 +02:00
Malte Rosenbjerg
33878ab605 Cleanup in using directives
Former-commit-id: 6c3129d417
2021-05-15 11:17:12 +02:00
Malte Rosenbjerg
c75d5c434a Merge branch 'master' into add-pcm-wrapper
Former-commit-id: 9632bf5b30
2021-05-15 11:14:44 +02:00
Malte Rosenbjerg
12e031dfb3 Fixes, renames and missing stuff
Former-commit-id: 27a2219b8e
2021-05-14 01:02:00 +02:00
Julien Loir
32dfb34724 Add simple support for PCM audio source wrapping
Former-commit-id: d8810682ef
2021-04-12 13:50:27 +02:00
Julien Loir
4eafa4533c Move System.IO in usings on some classes
Former-commit-id: e10657169e
2021-04-12 13:48:55 +02:00
Victor Horobchuk
c690817135 update
Former-commit-id: 4e6ecda884
2021-03-22 12:25:13 +02:00
Victor Horobchuk
93496db720 Update
Former-commit-id: 4e85482988
2021-03-18 21:37:02 +02:00
Victor Horobchuk
d0afc5001b Update
Former-commit-id: ab8be5cd57
2021-03-17 09:58:01 +02:00
Victor Horobchuk
229fb93980 Add mirror and default ForceFormat for OutputPipeArgument
Former-commit-id: ec1b8a6b07
2021-03-17 00:09:56 +02:00
Malte Rosenbjerg
263645f83b Fix tests
Former-commit-id: 1d6517796f
2021-03-15 23:43:22 +01:00
Malte Rosenbjerg
8817b4c765 Merge branch 'master' into master
Former-commit-id: 5a2ebcf0f3
2021-03-15 23:20:27 +01:00
Malte Rosenbjerg
aec737bbc5 Renaming to OutputUrlArgument
Former-commit-id: fc2802d5fb
2021-03-15 23:04:59 +01:00
Malte Rosenbjerg
085788c4e4 Merge pull request #179 from Codinlab/OutputStream
Add OutputStreamArgument

Former-commit-id: ce7eb9228b
2021-03-15 22:53:42 +01:00
Maxim Bagryantsev
fdc524d516 Moved Debug.WriteLine to Pipe disconnect
Former-commit-id: bbd9b7f55c
2021-03-15 20:44:48 +03:00
Maxim Bagryantsev
ba8904429d Fixed process hang on pipe images format mismatch
Former-commit-id: fe646752d3
2021-03-15 20:37:18 +03:00
Malte Rosenbjerg
7457168c44 Cleanup
Former-commit-id: df0205fb11
2021-03-07 00:26:08 +01:00
Malte Rosenbjerg
4a6fb20aab reorder method
Former-commit-id: 7444899106
2021-03-06 23:33:48 +01:00
Malte Rosenbjerg
f20c25d2ee change FrameRate on RawVideoPipeSource to double
Former-commit-id: cfda317883
2021-03-06 23:26:15 +01:00
Malte Rosenbjerg
b776422ada Fix tests
Former-commit-id: e49290b217
2021-03-06 21:25:17 +01:00
Malte Rosenbjerg
32e5e97864 Merge branch 'master' into refactor-video-filter-args
Former-commit-id: 8452672ee6
2021-03-05 18:06:50 +01:00
Malte Rosenbjerg
77e2403902 Init
Former-commit-id: 4f28983972
2021-03-05 18:06:40 +01:00
Malte Rosenbjerg
4f06258557 Merge pull request #180 from Codinlab/CancelTimeout
Add cancel timeout

Former-commit-id: 47779dce4d
2021-03-05 18:00:38 +01:00
Thierry Fleury
50cb183ae2 Add cancel timeout
(cherry picked from commit 6383164f267516fbd50d50b2a511c15c25a168dc)


Former-commit-id: 9672713e63
2021-03-02 19:43:24 +01:00
Thierry Fleury
93e56e523c Add OutputStreamArgument
(cherry picked from commit 0c64c4d81d7055a582d8377123dbc3b7ba86e444)


Former-commit-id: 157a53690f
2021-03-02 19:40:50 +01:00
Thierry Fleury
22340a4575 Add InputDeviceArgument
Former-commit-id: 73531b3947
2021-02-28 14:50:55 +01:00
crypton
bff3406545 Format -ss timespan argument to calculate hours
Former-commit-id: bb08076db4
2021-02-12 22:16:55 -08:00
Malte Rosenbjerg
1c016fed9a Merge branch 'master' into master
Former-commit-id: 6874ace962
2021-02-04 00:13:02 +01:00
hey-red
ce12f753c0 Fix incorrect condition
Former-commit-id: d16efbda31
2021-01-23 05:40:03 +03:00
Malte Rosenbjerg
3d640f9e08 Add NotifyOnOutput
Former-commit-id: cfee86199b
2020-12-18 00:40:09 +01:00
Malte Rosenbjerg
be477197cc Support specifying output encoding for ffmpeg and ffprobe output
Former-commit-id: a4aba666cd
2020-12-09 17:07:41 +01:00
Malte Rosenbjerg
732e3a0772 Merge branch 'master' into master
Former-commit-id: de689dbb50
2020-12-09 11:02:26 +01:00
Malte Rosenbjerg
949dc76f3f Also include output data on non-zero ffmpeg exitcode
Former-commit-id: 6bdf9da683
2020-12-09 10:58:21 +01:00