Commit graph

626 commits

Author SHA1 Message Date
Fedor Zhilkin
c540819893 Merge branch 'master' of github.com:Feodoros/FFMpegCore 2021-08-11 15:55:40 +03:00
Fedor Zhilkin
86ea16c432 Fix params order 2021-08-11 15:54:58 +03:00
Malte Rosenbjerg
fc9db2c04a
Merge branch 'master' into master 2021-08-11 00:43:03 +02:00
Fedor Zhilkin
562a50d874 Nullable streamIndex and inputFileIndex 2021-08-11 01:21:06 +03:00
Malte Rosenbjerg
04ebdb1907 Increase timeout on failing unit test 2021-08-10 10:38:56 +02:00
Malte Rosenbjerg
1d845e889a
Merge pull request #240 from GuyWithDogs/gwd_addcodectagstring
Added CodecTag and CodecTagString properties to FFProbeStream
2021-08-10 10:24:40 +02:00
Warrick Wilson
ac2b358fad Added CodecTag and CodecTagString properties to info derived from an FFProbe.Analyse() call. This allows for specific codecs to be identified to check compatibility with hardware limitations. 2021-08-09 14:52:39 -05:00
Malte Rosenbjerg
292841e40d Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2021-08-07 16:39:12 +02:00
Malte Rosenbjerg
e363440118 Load config file, if found, on first use 2021-08-07 16:39:10 +02:00
Malte Rosenbjerg
2722431457
Add non-code contributors 2021-08-07 16:08:15 +02:00
Malte Rosenbjerg
78c749c748
Update README.md 2021-08-07 15:34:40 +02:00
Malte Rosenbjerg
0efaf686f3 Specify README.md as nuget readme 2021-08-07 14:54:48 +02:00
Malte Rosenbjerg
914003ee32 Move Loop(1) to image FileInput. Fix for #206 2021-08-07 14:40:58 +02:00
Malte Rosenbjerg
e13376f175
Replace contributors block with image from contributors-img 2021-08-06 12:13:35 +02:00
Malte Rosenbjerg
28278301dc Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2021-08-06 11:13:45 +02:00
Malte Rosenbjerg
3888a07ab2
Merge branch 'master' into master 2021-08-06 08:10:37 +02:00
Malte Rosenbjerg
01cb994922
Merge pull request #236 from alex6dj/feature/support-subtitle-hard-burnning
Support subtitle hard burnning
2021-08-06 08:09:33 +02:00
alex6dj
14d457b946 Use long option for stream index for better clarity 2021-08-05 15:14:37 -04:00
alex6dj
6247bf6ea4 Document parameters 2021-08-05 15:11:23 -04:00
alex6dj
3a89062384 Subtitle hard-burn implementation. 2021-08-05 14:37:32 -04:00
Malte Rosenbjerg
fc23456eb1 Fix PcmAudioSampleWrapper namespace 2021-08-05 13:21:57 +02:00
Malte Rosenbjerg
1a87b0b133
Merge pull request #233 from alex6dj/feature/support-subtitles-stream
Basic ffprobe subtitle streams support
2021-08-05 13:16:48 +02:00
Malte Rosenbjerg
27051f5406
Merge branch 'master' into feature/support-subtitles-stream 2021-08-05 13:10:33 +02:00
Malte Rosenbjerg
d744d88a1f
Merge pull request #231 from chaitanyabd/master
Update README.md
2021-08-05 13:10:06 +02:00
Fedor Zhilkin
c30cf4c7ad Style guide fixes and minor refactoring 2021-08-03 21:58:40 +03:00
Fedor Zhilkin
37109bab34 Merge branch 'master' of github.com:rosenbjerg/FFMpegCore 2021-08-03 21:57:30 +03:00
alex6dj
47916eac29 Basic ffprobe test 2021-07-31 16:46:21 -04:00
alex6dj
f80d1fa3a6 Basic ffprobe subtitle support 2021-07-31 15:34:47 -04:00
chaitanyabd
a2b37cb920
Update README.md 2021-07-31 00:05:38 +05:30
Malte Rosenbjerg
7ebb47d757
Merge pull request #226 from rosenbjerg/master
v.4.4.0
2021-07-16 01:21:52 +02:00
Malte Rosenbjerg
587c453a7e Reduce timeout in cancellation token test 2021-07-16 01:17:20 +02:00
Malte Rosenbjerg
0c9c526e2a Update nuget info 2021-07-16 01:10:54 +02:00
Malte Rosenbjerg
27fb37700c Improve ffprobe exceptions 2021-07-16 01:02:38 +02:00
Malte Rosenbjerg
d3193827ac
Merge pull request #223 from CepheiSigma/hotfix
support specific StandardOutputEncoding & StandardErrorEncoding for ffprobe
2021-07-10 17:28:37 +02:00
cephei
ab82e3cc0f support specific StandardOutputEncoding & StandardErrorEncoding for ffprobe 2021-07-08 20:17:09 +08:00
Malte Rosenbjerg
e18b010540
Merge pull request #222 from patagonaa/master
Support cancellation token for cancelling FFMPEG processes
2021-07-08 00:09:39 +02:00
Patrick Krämer
3efc34565a Support cancellation token for cancelling FFMPEG processes 2021-07-07 20:16:14 +02:00
Malte Rosenbjerg
ef1f40b182
Merge pull request #219 from rosenbjerg/master
v.4.3.0
2021-06-08 22:20:00 +02:00
Malte Rosenbjerg
d5e8444cb8 Update nuget info 2021-06-08 19:10:30 +02:00
Malte Rosenbjerg
a1dbc3bb47
Merge pull request #204 from Namaneo/add-pcm-wrapper
Add PCM audio sample wrapper
2021-06-08 19:03:17 +02:00
Malte Rosenbjerg
f8692abc57
Merge branch 'master' into add-pcm-wrapper 2021-06-08 18:55:09 +02:00
Malte Rosenbjerg
64028b4ed3
Merge pull request #218 from rosenbjerg/bugfix/remove-y-arg-in-InputPipeArgument
Remove -y in InputPipeArgument
2021-06-08 18:54:43 +02:00
Malte Rosenbjerg
366a1cd6c0 Remove -y 2021-06-08 18:49:22 +02:00
Julien Loir
acd462a527 Add test for the new audio pipe 2021-05-25 16:14:40 +02:00
Malte Rosenbjerg
717b404b7f
Merge branch 'master' into add-pcm-wrapper 2021-05-19 08:20:35 +02:00
Malte Rosenbjerg
274bb9667e Update used GitHub Actions 2021-05-15 11:50:34 +02:00
Malte Rosenbjerg
be32a14619 Reorder using directives 2021-05-15 11:19:22 +02:00
Malte Rosenbjerg
e56521b2bb
Merge branch 'master' into add-pcm-wrapper 2021-05-15 11:17:46 +02:00
Malte Rosenbjerg
6c3129d417 Cleanup in using directives 2021-05-15 11:17:12 +02:00
Malte Rosenbjerg
9632bf5b30
Merge branch 'master' into add-pcm-wrapper 2021-05-15 11:14:44 +02:00