Commit graph

713 commits

Author SHA1 Message Date
Malte Rosenbjerg
8c67ddb769 Replace contributors block with image from contributors-img
Former-commit-id: e13376f175
2021-08-06 12:13:35 +02:00
Malte Rosenbjerg
8b3aadda08 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: 28278301dc
2021-08-06 11:13:45 +02:00
Malte Rosenbjerg
4c521aadcc Merge branch 'master' into master
Former-commit-id: 3888a07ab2
2021-08-06 08:10:37 +02:00
Malte Rosenbjerg
3e05428c94 Merge pull request #236 from alex6dj/feature/support-subtitle-hard-burnning
Support subtitle hard burnning

Former-commit-id: 01cb994922
2021-08-06 08:09:33 +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
Malte Rosenbjerg
d755c1d526 Fix PcmAudioSampleWrapper namespace
Former-commit-id: fc23456eb1
2021-08-05 13:21:57 +02:00
Malte Rosenbjerg
b46fd7b2ad Merge pull request #233 from alex6dj/feature/support-subtitles-stream
Basic ffprobe subtitle streams support

Former-commit-id: 1a87b0b133
2021-08-05 13:16:48 +02:00
Malte Rosenbjerg
1483de403e Merge branch 'master' into feature/support-subtitles-stream
Former-commit-id: 27051f5406
2021-08-05 13:10:33 +02:00
Malte Rosenbjerg
15e0d22588 Merge pull request #231 from chaitanyabd/master
Update README.md

Former-commit-id: d744d88a1f
2021-08-05 13:10:06 +02: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
alex6dj
041d40effd Basic ffprobe test
Former-commit-id: 47916eac29
2021-07-31 16:46:21 -04:00
alex6dj
bd7dcf9edd Basic ffprobe subtitle support
Former-commit-id: f80d1fa3a6
2021-07-31 15:34:47 -04:00
chaitanyabd
3951eda615 Update README.md
Former-commit-id: a2b37cb920
2021-07-31 00:05:38 +05:30
Malte Rosenbjerg
12084323f5 Merge pull request #226 from rosenbjerg/master
v.4.4.0

Former-commit-id: 7ebb47d757
2021-07-16 01:21:52 +02:00
Malte Rosenbjerg
2601dc3a83 Reduce timeout in cancellation token test
Former-commit-id: 587c453a7e
2021-07-16 01:17:20 +02:00
Malte Rosenbjerg
06a519eefe Update nuget info
Former-commit-id: 0c9c526e2a
2021-07-16 01:10:54 +02:00
Malte Rosenbjerg
33ab024a60 Improve ffprobe exceptions
Former-commit-id: 27fb37700c
2021-07-16 01:02:38 +02:00
Malte Rosenbjerg
24b4a05024 Merge pull request #223 from CepheiSigma/hotfix
support specific StandardOutputEncoding & StandardErrorEncoding for ffprobe

Former-commit-id: d3193827ac
2021-07-10 17:28:37 +02:00
cephei
2f66d24fa5 support specific StandardOutputEncoding & StandardErrorEncoding for ffprobe
Former-commit-id: ab82e3cc0f
2021-07-08 20:17:09 +08:00
Malte Rosenbjerg
30bd3674f3 Merge pull request #222 from patagonaa/master
Support cancellation token for cancelling FFMPEG processes

Former-commit-id: e18b010540
2021-07-08 00:09:39 +02: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
b044577a36 Merge pull request #219 from rosenbjerg/master
v.4.3.0

Former-commit-id: ef1f40b182
2021-06-08 22:20:00 +02:00
Malte Rosenbjerg
e8f9fa52ae Update nuget info
Former-commit-id: d5e8444cb8
2021-06-08 19:10:30 +02:00
Malte Rosenbjerg
6ab2bc0830 Merge pull request #204 from Namaneo/add-pcm-wrapper
Add PCM audio sample wrapper

Former-commit-id: a1dbc3bb47
2021-06-08 19:03:17 +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
afb78bb61d Merge pull request #218 from rosenbjerg/bugfix/remove-y-arg-in-InputPipeArgument
Remove -y in InputPipeArgument

Former-commit-id: 64028b4ed3
2021-06-08 18:54:43 +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
5a6f3c3f46 Merge branch 'master' into add-pcm-wrapper
Former-commit-id: 717b404b7f
2021-05-19 08:20:35 +02:00
Malte Rosenbjerg
009f93d7c5 Update used GitHub Actions
Former-commit-id: 274bb9667e
2021-05-15 11:50:34 +02:00
Malte Rosenbjerg
2ad0381413 Reorder using directives
Former-commit-id: be32a14619
2021-05-15 11:19:22 +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
5a7ba5e010 Merge pull request #210 from rosenbjerg/master
Add mirror video filter

Former-commit-id: 1eb8def63f
2021-05-14 21:01:47 +02:00
Malte Rosenbjerg
0ceff3aa50 Merge branch 'release' into master
Former-commit-id: a586390f3f
2021-05-14 01:24:06 +02:00
Malte Rosenbjerg
7cf6b43de8 Merge pull request #193 from GorobVictor/MirrorAttributeAndDefaultForceFormat
Add mirror and default ForceFormat for OutputPipeArgument

Former-commit-id: 19569cbc1b
2021-05-14 01:12:11 +02:00
Malte Rosenbjerg
4d3ba4192b Update nuget meta
Former-commit-id: 811471ed77
2021-05-14 01:08:01 +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
7bee36e2ca Add support for Format16bppRgb555 in Bitmap wrapper
Former-commit-id: 1711f98bd5
2021-04-12 13:49:36 +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
871620157c Merge pull request #192 from rosenbjerg/master
v.4.1.0

Former-commit-id: 18201e2cde
2021-03-15 23:54:02 +01:00