Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity
22511 commits 19 branches 78 tags 1.3 GiB
Commit graph

2742 commits

Author SHA1 Message Date
Joshua M. Boniface
59040bfa7d
Merge pull request #7255 from Shadowghost/external-sub-audio 2022-02-21 12:42:49 -05: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
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