Cody Robibero
13df026f6b
Merge pull request #7654 from Shadowghost/nfo-provider-fix
...
Prefer MetadataProvider enum as provider id key over arbitrary strings
(cherry picked from commit a2abae3014578e8d9c7f1b54140fe3dcf1503ad2)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-28 09:26:45 -04:00
Cody Robibero
1ed57f48a5
Merge pull request #7624 from nielsvanvelzen/quickconnect-enable-d
...
(cherry picked from commit 1d5961126e6b8415ebd494a56acddd68624cd75b)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-28 09:26:45 -04:00
Joshua M. Boniface
96d2d2428a
Merge pull request #7590 from crobibero/dotnet-6.0.4
...
(cherry picked from commit 5778541d2fa9a6a2732b715e8c60421e44e035da)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-17 15:45:47 -04:00
Cody Robibero
688553b9a8
Merge pull request #7537 from dmitrylyzo/fix-streambuilder
...
(cherry picked from commit 5833c707259247338c27b1a75a175c5aba925c29)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-17 15:45:10 -04:00
Cody Robibero
1960b5bdce
Merge pull request #7523 from crobibero/null-stream
...
Allow media without streams to playback
(cherry picked from commit 577325b7888c5769c9d9c329ebd40e5f388242ad)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-07 12:54:58 -04:00
dependabot[bot]
d7c9cf3fea
Bump MimeTypes from 2.3.0 to 2.4.0 ( #7552 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-04 16:38:25 +02:00
Cody Robibero
96a03776e1
Fix TranscodeReasons property name
2022-03-26 12:20:29 -06:00
Shadowghost
4e91c3ebdc
Fix DLNA DirectPlay
2022-03-25 18:02:31 +01:00
Joshua M. Boniface
8197e5921e
Merge pull request #7198 from dmitrylyzo/transcode-conditions
2022-03-25 10:11:45 -04:00
dependabot[bot]
dde984bd0e
Bump StyleCop.Analyzers from 1.2.0-beta.376 to 1.2.0-beta.406
...
Bumps [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers ) from 1.2.0-beta.376 to 1.2.0-beta.406.
- [Release notes](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/releases )
- [Commits](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/compare/1.2.0-beta.376...1.2.0-beta.406 )
---
updated-dependencies:
- dependency-name: StyleCop.Analyzers
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 12:22:11 +00:00
Dmitry Lyzo
e4137a6279
Fix remuxing
2022-03-20 09:11:46 +03:00
Dmitry Lyzo
1fe82d0deb
Add TranscodingProfile conditions
2022-03-20 09:11:46 +03:00
Cody Robibero
b9c3a497d5
Use requested bitrate for calculations
2022-03-19 12:08:42 -06:00
Bond-009
bb7068cb63
Move StreamBuilderTests to correct project ( #7461 )
2022-03-18 22:19:02 +01:00
Nyanmisaka
18c7dc210c
Prefer Cuvid to Nvdec by default for better performance
2022-03-17 18:01:58 +08:00
Cody Robibero
d29c7c1d9e
Revert using Math.Clamp
2022-03-13 12:46:13 -06:00
Cody Robibero
e6df698df1
Merge pull request #7325 from eyezak/issue/6450
2022-03-12 09:08:25 -07:00
Cody Robibero
3ea4174d12
Fix flipped Clamp args
2022-03-12 07:17:59 -07:00
Cody Robibero
28223704f3
Merge pull request #7441 from 1337joe/add-external-stream-indicator
...
Add label for external audio/sub tracks
2022-03-11 07:48:23 -07:00
Claus Vium
53209830e7
Merge pull request #7346 from Bond-009/guid
...
Optimize Guid comparisons
2022-03-11 08:15:12 +01:00
Joe Rogers
1a307db7eb
Add label for external audio/sub tracks
2022-03-10 22:20:35 +01:00
Cody Robibero
a5ffde0e9c
Merge pull request #7432 from Bond-009/socketfactory
2022-03-10 14:19:08 -07:00
Joshua M. Boniface
388e0cba9f
Merge pull request #7434 from crobibero/dotnet-6.0.3
2022-03-10 12:47:18 -05:00
Cody Robibero
965bf7332f
Update to dotnet 6.0.3
2022-03-08 17:16:33 -07:00
Bond_009
1d018c5575
SocketFactory: Remove redundant code
...
ExclusiveAddressUse should be false by default afaik
2022-03-08 22:20:43 +01:00
Cody Robibero
da41cd365c
Suggestions from review
2022-03-06 18:17:49 -07:00
Cody Robibero
bbd5d11d3b
Remove TranscodeReason.None, Add JsonFlagEnum tests
2022-03-06 18:13:54 -07:00
Cody Robibero
c331e11c24
Clean up EnumFlags serialization
2022-03-06 18:13:54 -07:00
Isaac Gordezky
9ebd521754
Update MediaBrowser.Model/Dlna/StreamBuilder.cs
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-03-06 18:13:54 -07:00
Isaac Gordezky
84a3db6f84
Fix transcode video matching and add tests for Transcode and Safari
2022-03-06 18:13:54 -07:00
Isaac Gordezky
5e779f20ee
Series: issue-6450
...
Issue: https://github.com/jellyfin/jellyfin/issues/6450
Enable DirectPlay responses
Rewrite DirectPlay and DirectStream resolution
Prefer copy transcode video codec options
Enhance condition processor
Support DirectStream and Transcode with parity
Rework audio stream selection and add tests for ExternalAudio
Update MediaInfoHelper to only call StreamBuilder once
2022-03-06 18:13:54 -07:00
Isaac Gordezky
d871dded9f
Convert TranscodeReason to Flags
2022-03-06 18:13:54 -07:00
Patrick Farwick
27b81a535c
Let the UI show which DTS profile is in use
...
There are different profiles for DTS. For example, both DTS and DTS-HD
MA use the same codec, but provide a different profile.
Some files may provide both a DTS and DTS-HD MA audio track. With this
change, the UI shows which track is using which profile to allow the
user to choose between them.
2022-03-06 19:11:02 +00:00
Cody Robibero
3dc0cfc36e
Merge pull request #7388 from GermanCoding/iso639-undefined
2022-03-05 12:43:51 -07:00
Joshua M. Boniface
947ff9defe
Merge pull request #7404 from nyanmisaka/omx
2022-03-05 14:35:41 -05:00
Joshua M. Boniface
a123391e7e
Merge pull request #7383 from thornbill/next-up-rewatching
2022-03-05 14:29:49 -05:00
nyanmisaka
bfc27e494b
Remove the deprecated OMX and MMAL HWA
2022-03-05 21:47:59 +08:00
GermanCoding
3f6a14e1fd
Use extension method for list search
2022-03-04 16:44:55 +01:00
Claus Vium
136eab9b1e
Merge pull request #7370 from crobibero/internal-metadata-path
...
Only add internal files if the internal metadata path exists
2022-03-04 08:13:58 +01:00
GermanCoding
e09641b452
Hide ISO 639-2 special codes in display titles
...
They are still shown in associated metadata, just hidden from the more visible display titles.
2022-03-04 00:55:20 +01:00
Bond-009
b356c2b212
Merge pull request #7324 from Maxr1998/sort-by-index
2022-03-03 13:55:45 +01:00
Cody Robibero
1b3e56bae3
Split DirectoryExists and FileExists
2022-03-02 19:55:44 -07:00
Bill Thornton
055c63bdee
Include played and unplayed results in the same next up request
2022-03-01 00:50:16 -05:00
Cody Robibero
dc1b224667
Add JsonConstructor
2022-02-28 17:30:17 -07:00
Cody Robibero
fc5c6c0404
Use IFileSystem
2022-02-28 17:14:33 -07:00
Joshua M. Boniface
59040bfa7d
Merge pull request #7255 from Shadowghost/external-sub-audio
2022-02-21 12:42:49 -05:00
Bond_009
f50a250cd9
Optimize Guid comparisons
...
* Use Guid.Equals(Guid) instead of the == override
* Ban the usage of Guid.Equals(Object) to prevent accidental boxing
* Compare to default(Guid) instead of Guid.Empty
2022-02-21 14:15:09 +01:00
SenorSmartyPants
bbac59c6d6
Rewatching next up ( #7253 )
2022-02-20 18:05:57 +01:00
Shadowghost
ca5112f45a
feat(external-media): refactor external subtitle and audio provider
2022-02-18 22:19:24 +01:00
Maxr1998
0aaf2f470a
Implement Comparers for (Parent)IndexNumber
...
Can be used in item queries to sort by ParentIndexNumber and IndexNumber (used for disc and track numbers for example).
2022-02-17 01:35:59 +01:00
Bond_009
5732e6188c
Fix some warnings
2022-02-15 18:59:46 +01:00
Cody Robibero
4ef0099598
Merge pull request #7233 from Bond-009/warn60
2022-02-14 16:57:00 -07:00
Joshua M. Boniface
94b5334da5
Merge pull request #7290 from crobibero/dotnet-6.0.2
2022-02-14 11:01:55 -05:00
Bond_009
8b2556adba
Fix display preferences
2022-02-14 14:46:04 +01:00
Bond_009
1c14c86b20
Fix some warnings
2022-02-14 14:46:04 +01:00
dependabot[bot]
68e7072698
Bump MimeTypes from 2.2.1 to 2.3.0 ( #7309 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14 14:14:04 +01:00
Cody Robibero
603b6fe173
Merge pull request #7054 from matthew-jones-uk/disable-embedded-subs
2022-02-11 13:20:37 -07:00
Matthew Jones
b7cab46b4a
Added values to EmbeddedSubtitleOptions enum
2022-02-09 23:33:46 +00:00
Cody Robibero
b98cc71c3b
Update to dotnet 6.0.2
...
Signed-off-by: Cody Robibero <cody@robibe.ro>
2022-02-08 17:36:20 -07:00
Cody Robibero
e5701c396a
Merge pull request #6436 from daullmer/splashscreen
2022-01-28 08:12:21 -07:00
Matthew Jones
91d143d6ee
Changed boolean options to enums
2022-01-26 16:09:05 +00:00
Cody Robibero
ea3d79c0eb
Merge pull request #7235 from Bond-009/async4
2022-01-22 15:52:12 -07:00
Niels van Velzen
2afcaa6ae1
Use Guid for BaseItemDto parent ids
2022-01-22 22:29:02 +01:00
Bond_009
2dcb2f8a9f
Ban the usage of Task.Result
...
If the calling function can't be made async easily you can still use
.GetAwaiter().GetResult(), which is way easier to find in the future
2022-01-22 16:48:31 +01:00
Niels van Velzen
e86f778c05
Use Guid for BaseItemPerson.Id
2022-01-22 15:46:12 +01:00
Bond-009
cd675475bc
Merge pull request #7225 from crobibero/query-result
2022-01-21 19:50:08 +01:00
Cody Robibero
34ee6d82fb
Merge pull request #6600 from cvium/keyframe_extraction_v1
2022-01-20 08:54:40 -07:00
Cody Robibero
a60cb280a3
Properly populate QueryResult
2022-01-20 08:53:06 -07:00
Matthew Jones
61d8d40a4a
Added type options to disable embedded subs
2022-01-14 11:25:08 +00:00
Matthew Jones
4df7590e52
Add DisableEmbeddedSubtitles setting
...
Disables embedded subs being added to metadata
2022-01-14 11:25:08 +00:00
cvium
6ffa9539bb
Refactor and add scheduled task
2022-01-11 23:30:30 +01:00
Cody Robibero
0d335082c8
suggestions from review
2022-01-10 10:59:32 -07:00
Cody Robibero
9b1965b48a
Merge pull request #7101 from Bond-009/imagejpg
...
Remove incorrect mime type image/jpg
2022-01-08 04:45:58 -07:00
cvium
c658a883a2
Merge branch 'master' into keyframe_extraction_v1
...
# Conflicts:
# Jellyfin.Api/Controllers/DynamicHlsController.cs
# MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
# MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
2022-01-07 10:23:22 +01:00
Cody Robibero
904efeaddc
Add null check for audio stream
2022-01-06 08:15:37 -07:00
Cody Robibero
360fd70fc7
Clean up
2022-01-04 08:44:03 -07:00
David Ullmer
9e0958d822
Apply suggestions from code review
2022-01-04 08:20:16 -07:00
David Ullmer
6ad020acb2
Include Splashscreen url in the branding endpoint
2022-01-04 08:20:16 -07:00
David Ullmer
e026ba84c5
Add Splashscreen API endpoint to ImageController
2022-01-04 08:20:16 -07:00
Bond_009
dc222b75c5
Remove incorrect mime type image/jpg
2022-01-04 10:40:16 +01:00
Cody Robibero
fcb8ff7c0f
Merge pull request #7052 from crobibero/image.jpeg
2022-01-03 17:47:52 -07:00
Cody Robibero
7bfc6b5679
Remove more warnings
2021-12-27 07:38:06 -07:00
Bond_009
ea8f40e84a
More cleanup
2021-12-27 14:20:05 +00:00
Cody Robibero
78bb581f0c
Merge pull request #6934 from nyanmisaka/hwa
...
HWA pipeline refactor, AMD/Intel/Nvidia full hardware filtering support, AV1 hwdec
2021-12-26 17:32:06 +00:00
Cody Robibero
6804624c15
Add image/jpg to extension lookup
2021-12-25 11:41:39 -07:00
Bond_009
cbfa355e31
Update StyleCop
2021-12-24 18:28:27 +01:00
nyanmisaka
728a5988b3
Merge remote-tracking branch 'origin/master' into hwa
2021-12-25 00:33:17 +08:00
nyanmisaka
b2d85a02c2
Apply suggestions from code review
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: Bond_009 <bond.009@outlook.com>
2021-12-24 17:03:57 +08:00
nyanmisaka
4b9c84c52e
EncodingHelper hwaccel pipelines refactor
...
separate the HW pipeline according to HWA method for maintainability.
2021-12-24 17:03:57 +08:00
Cody Robibero
55b429edb7
Merge pull request #6920 from marius-luca-87/subtitle_drop
2021-12-24 02:01:44 +00:00
Cody Robibero
076a13abeb
Merge pull request #7029 from cvium/allocations_maybe
2021-12-24 01:59:25 +00:00
cvium
a7a7173cd5
Force a remux/transcode with external audio files
2021-12-21 14:35:58 +01:00
cvium
b880dc8a4a
Use our own Contains extension
2021-12-20 13:31:07 +01:00
Bond_009
a4565da4a9
Use System.IO.Compression instead of SharpCompress for zips
...
Also removes unused methods from ZipClient
2021-12-18 17:52:38 +01:00
Joe Rogers
dea5a3f3bc
Deprecate LibraryOptions.EnableInternetProviders
2021-12-16 00:52:18 +01:00
Joshua M. Boniface
7405450da2
Merge pull request #7002 from crobibero/dotnet-6.0.1
2021-12-15 10:36:18 -05:00
Claus Vium
4c9bd905c6
Merge pull request #6979 from crobibero/baseitemkind
...
Use BaseItemKind where possible
2021-12-15 08:28:44 +01:00
Cody Robibero
5e8aaa68cf
Update to dotnet 6.0.1
2021-12-14 23:47:07 -07:00
Cody Robibero
32629cd7da
Use BaseItemKind where possible
2021-12-12 06:11:27 -07:00
Bond_009
7ee96a59d3
Use correct jpeg MIME type
...
image/jpg isn't a valid MIME type
2021-12-12 02:07:35 +01:00
Cody Robibero
4d1b824651
Merge pull request #6902 from cvium/migrate_networkconfig
...
Migrate network configuration safely
2021-12-11 12:04:58 -07:00
Marius Luca
7d86ef6f22
- add an option for dropping specific subtitle formats using the DLNA SubtitleProfile
2021-12-09 17:52:51 +02:00
Ahmed Rafiq
0e491025ae
Refactor MimeTypes.ToExtension()
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-12-04 21:13:18 +06:00
Ahmed Rafiq
40e05a7993
Update documentation
2021-12-04 21:06:51 +06:00
Ahmed Rafiq
6193fdea69
Use MimeTypes package to determine MIME type
...
This simplifies the code since we don't have to keep large mappings of extensions and MIME types.
We still keep the ability to override the mappings for:
- filling in entries not present in the package, for e.g. ".azw3"
- picking preferred extensions, for e.g. MimeTypes provides ".conf" as a possible extionsion for "text/plain", and while that is correct, ".txt" would be preferrable
- compatibility reasons
2021-12-04 20:08:16 +06:00
Bond_009
beafd6eaab
Use JsonContent where possible
...
Should reduce the # of allocated bytes
2021-12-01 15:40:06 +01:00
Marius Luca
5b5ae1ef52
- enable seek function when direct streaming over DLNA
2021-11-26 18:09:34 +02:00
cvium
69df004b9f
Migrate network configuration safely
2021-11-24 13:00:12 +01:00
Cody Robibero
03c7bcf9c6
Merge pull request #6870 from cvium/fix_omdb_image_provider
2021-11-20 08:50:22 -07:00
Cody Robibero
0009e5cc27
Merge pull request #6850 from PetrusZ/collection-validator
2021-11-19 07:54:41 -07:00
cvium
96ea865681
Refactor omdb providers
2021-11-19 15:32:07 +01:00
Petrus.Z
acb86066ff
Replace library option to AutomaticallyAddToCollection
...
Signed-off-by: Petrus.Z <silencly07@gmail.com>
2021-11-18 16:00:14 +08:00
Petrus.Z
0a0ddb0eaf
Add AutoCollection option
...
it can determine whether auto create/add movies to collection
Signed-off-by: Petrus.Z <silencly07@gmail.com>
2021-11-17 14:02:07 +08:00
Bond_009
257e1be95f
Fix some warnings
2021-11-16 16:31:57 +01:00
Joe Rogers
ca99a27611
Add setter for CustomPrefs
2021-11-15 22:03:19 +01:00
dependabot[bot]
bd32cecf7a
Bump Microsoft.SourceLink.GitHub from 1.1.0 to 1.1.1
...
Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink ) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/dotnet/sourcelink/releases )
- [Commits](https://github.com/dotnet/sourcelink/compare/1.1.0...1.1.1 )
---
updated-dependencies:
- dependency-name: Microsoft.SourceLink.GitHub
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:01:08 +00:00
Cody Robibero
34df1a030b
Merge pull request #6818 from Bond-009/password
2021-11-13 16:56:25 -07:00
Cody Robibero
132440c683
Remove Obsolete attribute on enum
2021-11-12 06:58:18 -07:00
Cody Robibero
3de86ffdb4
Fix nullability on DisplayPreferencesDto
...
Remove duplicate, fix namespace
2021-11-11 07:34:36 -07:00
Bond_009
5265b3eee7
Replace PBKDF2-SHA1 with PBKDF2-SHA512
...
This also migrates already created passwords on login
Source for the number of iterations:
https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2
2021-11-10 22:34:54 +01:00
Cody Robibero
4c88bf3fe3
Merge pull request #6808 from cvium/dlnope_never_again
2021-11-09 20:34:09 -07:00
Claus Vium
c50c9c3dbf
Merge pull request #6794 from Bond-009/dead
...
Remove some dead code
2021-11-09 19:47:34 +01:00
cvium
6985a4f255
Fix SortCriteria and refactor SetSorting
2021-11-09 19:31:54 +01:00
Bond_009
994101fcf4
Remove some dead code
2021-11-09 16:28:39 +01:00
dependabot[bot]
c2d99dc3f0
Bump Microsoft.SourceLink.GitHub from 1.0.0 to 1.1.0
...
Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink ) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/dotnet/sourcelink/releases )
- [Commits](https://github.com/dotnet/sourcelink/compare/1.0.0...1.1.0 )
---
updated-dependencies:
- dependency-name: Microsoft.SourceLink.GitHub
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-09 13:11:42 +00:00
Cody Robibero
64652b6392
Fix and disable new dotnet6 warnings
2021-11-08 12:40:52 -07:00
Cody Robibero
40045d2147
Update to full dotnet 6
2021-11-08 09:40:12 -07:00
Claus Vium
0ee43f897b
Merge pull request #5918 from crobibero/client-logger
...
Add endpoint to log client events
2021-11-08 07:46:51 +01:00
Joe Rogers
b4bf5af7c8
Remove ImageType.Screenshot and ItemFields.Screenshot
2021-11-06 20:43:20 +01:00
Cody Robibero
3398f7f953
Merge branch 'master' into client-logger
2021-11-03 07:52:06 -06:00
Cody Robibero
f444e93a56
Merge remote-tracking branch 'upstream/master' into client-logger
2021-11-02 17:56:12 -06:00
zehner
bbf40d6be2
Update StreamBuilder.cs
...
LogLevel INFO => DEBUG
2021-11-02 09:35:09 +01:00
Cody Robibero
73201ed498
Default log upload to enabled
2021-10-29 06:33:46 -06:00
Cody Robibero
c534c45033
Suggestions from review
2021-10-27 19:20:14 -06:00
Claus Vium
b0e0eba667
Merge pull request #6737 from Bond-009/nullable9
...
Enable nullable for MediaBrowser.Providers
2021-10-27 09:04:18 +02:00
Cody Robibero
f78f1e834c
Merge remote-tracking branch 'upstream/master' into client-logger
2021-10-26 17:43:36 -06:00
Bond_009
f5ca9cbc3b
Enable nullable for MediaBrowser.Providers
2021-10-26 15:49:01 +02:00
Bond_009
1b6eb2ff2d
Enable nullable for more files
2021-10-26 13:56:30 +02:00
Cody Robibero
2b10251b32
Update to dotnet6.rc2
2021-10-12 18:31:58 -06:00
Claus Vium
1156699481
Merge pull request #6657 from Bond-009/dotnetbug
2021-10-09 12:19:44 +02:00
Claus Vium
b16e6621b3
Merge pull request #6663 from crobibero/dotnet-6-rc1
...
Reference dotnet6-rc1 packages
2021-10-08 16:06:15 +02:00
Bond_009
03f933aaa0
Fix the last few warnings
...
Enables TreatWarningsAsErrors for all projects
2021-10-06 11:30:45 +02:00
Cody Robibero
017380f1dd
Reference dotnet6-rc1 packages
2021-10-04 07:43:40 -06:00
Bond_009
9af16fcb6c
Remove workaround for dotnet/runtime#42790
2021-10-03 19:52:38 +02:00
KonH
6cbfdea4c0
Fix warning: Type cast is redundant ( #2149 )
2021-10-03 11:05:18 +07:00
KonH
d45fcdd5af
Fix warning: Redundant control flow jump statement ( #2149 )
2021-10-03 11:02:53 +07:00
KonH
b6bf43af45
Fix warning: Using directive is not required by the code and can be safely removed ( #2149 )
2021-10-03 10:49:41 +07:00
Cody Robibero
9234e5bf80
Remove all instances of en-US culture
2021-09-26 09:11:25 -06:00
cvium
30f3be1da0
Merge branch 'master' into keyframe_extraction_v1
2021-09-25 20:52:09 +02:00
Bond_009
f31224fa8f
Remove sync FileStream hack
2021-09-25 19:44:40 +02:00