Commit graph

503 commits

Author SHA1 Message Date
Malte Rosenbjerg
e24b652695 Add support for drawtext argument
Former-commit-id: ebd9ff0adc
2020-02-25 23:19:30 +01:00
Malte Rosenbjerg
62e0a55045 Update ci.yml
Former-commit-id: 6e37592e24
2020-02-21 18:13:59 +01:00
Malte Rosenbjerg
933d484b80 Update release.yml
Former-commit-id: a016d13d25
2020-02-21 18:09:27 +01:00
Malte Rosenbjerg
8d5bdc6af1 Merge pull request #38 from rosenbjerg/master
FFMpegCore v1.1.0

Former-commit-id: e877ba37fc
2020-02-21 18:03:50 +01:00
Malte Rosenbjerg
dce7d75f67 Update ci.yml
Former-commit-id: a129c34415
2020-02-21 18:00:19 +01:00
Malte Rosenbjerg
1820b96d18 Update ci.yml
Former-commit-id: 1223836a24
2020-02-21 17:57:25 +01:00
Malte Rosenbjerg
0168060628 Update release.yml
Former-commit-id: 3c09a2041b
2020-02-21 17:57:12 +01:00
Malte Rosenbjerg
3d17f53b26 Update release.yml
Former-commit-id: e20d7935ad
2020-02-21 17:54:54 +01:00
Malte Rosenbjerg
cb945def16 Update release.yml
Former-commit-id: 43a0fb1b7a
2020-02-21 17:53:01 +01:00
Malte Rosenbjerg
d6810bf917 Update release.yml
Former-commit-id: 15bedea183
2020-02-21 17:48:29 +01:00
Malte Rosenbjerg
1ac2664f58 Release branch init
Former-commit-id: 4ea246ee70
2020-02-21 17:40:03 +01:00
Malte Rosenbjerg
25cc42ba63 Create release.yml
Former-commit-id: 8983b94b84
2020-02-21 17:36:12 +01:00
Malte Rosenbjerg
889820b32c Prepare nuget info
Former-commit-id: 4ea76c847a
2020-02-21 17:14:07 +01:00
Malte Rosenbjerg
0164c801c1 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: c41b124588
2020-02-20 23:04:54 +01:00
Malte Rosenbjerg
4dd179c2d4 Refactoring
Former-commit-id: 6e67f77c32
2020-02-20 23:04:51 +01:00
Malte Rosenbjerg
563b69d68b Merge pull request #37 from Crydsch/master
Fix duration parsing of .mkv and .webm files

Former-commit-id: 28b9fa13af
2020-02-18 19:36:21 +01:00
Malte Rosenbjerg
922e9c5811 Merge branch 'master' into master
Former-commit-id: 779de04ee0
2020-02-18 18:21:10 +01:00
Malte Rosenbjerg
662377903b Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: 919ddd1fa9
2020-02-18 17:19:29 +01:00
Malte Rosenbjerg
bdeb395189 Larger epsilon needed
Former-commit-id: f6bb998ee2
2020-02-18 17:17:59 +01:00
Malte Rosenbjerg
e4c360761b Update ci.yml
Former-commit-id: 6cdd8a643f
2020-02-18 17:07:48 +01:00
Malte Rosenbjerg
084fb71a93 Fix unit test
FFProbe says 1:19.48 so there about should be good


Former-commit-id: 6d6c54aa12
2020-02-18 17:06:29 +01:00
Malte Rosenbjerg
2b0d2c4b44 Merge branch 'master' into master
Former-commit-id: ba863ae255
2020-02-18 16:55:04 +01:00
Malte Rosenbjerg
8e575efca6 Delete travis-ffmpeg-config.js
Former-commit-id: 5d8ce56b47
2020-02-16 21:09:24 +01:00
Malte Rosenbjerg
916ff3ae31 Delete .travis.yml
Former-commit-id: 007c042d3e
2020-02-16 21:09:04 +01:00
Malte Rosenbjerg
003ca8b95c Update ci.yml
Former-commit-id: 5baae8c4f9
2020-02-16 21:07:01 +01:00
Malte Rosenbjerg
9542d68543 Update README.md
Former-commit-id: d5c568b79e
2020-02-16 21:05:33 +01:00
Malte Rosenbjerg
2c08a4a72b Update VideoTest.cs
Former-commit-id: 3f61ac0104
2020-02-16 21:00:50 +01:00
Malte Rosenbjerg
51d2a078c9 Fix unit test
Former-commit-id: 5c15d90641
2020-02-16 20:59:59 +01:00
Malte Rosenbjerg
7426e1091a Update ffmpeg.config.json
Former-commit-id: bdd826f650
2020-02-16 20:55:06 +01:00
Malte Rosenbjerg
e61646cf7d Update ffmpeg.config.json
Former-commit-id: 32a892e7d9
2020-02-16 20:50:41 +01:00
Malte Rosenbjerg
fb339c889a Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: c783861aeb
2020-02-16 20:48:25 +01:00
Malte Rosenbjerg
cf5ce26db8 Update ffmpeg.config.json
Former-commit-id: 83894a842e
2020-02-16 20:42:10 +01:00
Crydsch
bce2b98d5d Merge branch 'master' into master
Former-commit-id: a2f09b22f1
2020-02-16 17:23:32 +01:00
Malte Rosenbjerg
41e1a871ac Update ci.yml
Former-commit-id: a1c5a9fc60
2020-02-16 11:16:28 +01:00
Malte Rosenbjerg
3ef25ab48b Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f949fad7e6
2020-02-16 11:14:55 +01:00
Malte Rosenbjerg
dda016040f Change test path
Former-commit-id: 757d23a99b
2020-02-16 11:14:01 +01:00
Malte Rosenbjerg
949458bf03 Update ci.yml
Former-commit-id: b680302e99
2020-02-16 11:13:21 +01:00
Malte Rosenbjerg
9e05259fb4 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f2dae96a03
2020-02-16 11:08:29 +01:00
Malte Rosenbjerg
a7d2102958 Bump versions
Former-commit-id: 16a4726426
2020-02-16 11:08:15 +01:00
Malte Rosenbjerg
980fe8d74c Update .travis.yml
Former-commit-id: 32fb4ec835
2020-02-16 11:03:51 +01:00
Malte Rosenbjerg
0d6acfebc8 Update ci.yml
Former-commit-id: b222340dcc
2020-02-16 11:02:59 +01:00
Malte Rosenbjerg
f89a3e2ef3 Update ci.yml
Former-commit-id: 95e5578bff
2020-02-16 10:59:08 +01:00
Malte Rosenbjerg
c7eddb91c3 Update .travis.yml
Former-commit-id: d6aa7151d3
2020-02-16 10:55:09 +01:00
Malte Rosenbjerg
c9dc111f17 Update ci.yml
Former-commit-id: 90727eb228
2020-02-16 10:46:58 +01:00
Malte Rosenbjerg
55dd041961 Update ci.yml
Former-commit-id: a7e2478862
2020-02-16 10:46:30 +01:00
Malte Rosenbjerg
17d0d718af Create ci.yml
Former-commit-id: d97a081813
2020-02-16 10:36:38 +01:00
Crydsch
703da64f44 Fix NullReferenceException if no duration exists
Former-commit-id: 5daef17b44
2020-02-13 20:58:14 +01:00
Crydsch
073cfee5ea Lift restriction of duration to seconds
Former-commit-id: 0b35935b5d
2020-02-13 17:36:49 +01:00
Cry dsch
ed5fffd7a9 Fix duration parsing of .mkv and .webm files
Former-commit-id: fbd9f3fc89
2020-02-12 21:37:10 +01:00
Cry dsch
68c24621e9 Merge https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f10c01e667
2020-02-12 21:31:24 +01:00