cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 18:42:52 -07:00
Code Issues Packages Projects Releases Wiki Activity
15,403 Commits 20 Branches 82 Tags 1.3 GiB
5be60782ed
Commit Graph

1001 Commits

Author SHA1 Message Date
Vasily
5be60782ed Fix support for attachments with baseURL set 
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
 2020-04-06 14:06:42 +03:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Vasily
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi 
Fix various bugs in HWA subtitle burn-in
 2020-03-31 23:19:44 +03:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
0af353404c fix the UTF-16 error while burning ass/ssa subtitles 2020-03-30 14:47:55 +08:00
Nyanmisaka
0e9d9a7897 fix the incorrect HLS time while using hw encoders 2020-03-30 14:48:57 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Bond_009
bbd4860b55 Another warning 2020-03-11 16:30:22 +01:00
MrTimscampi
e8c593f413 Add baseURL to attachments 2020-03-07 17:41:36 +01:00
artiume
697aee5b0c
Merge pull request #21 from jellyfin/master 
nightly
 2020-02-23 10:57:52 -05:00
Bond_009
07cc4be6a7 Fix some warnings 
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
 2020-02-23 12:11:43 +01:00
Bond_009
ffc9eb67f0 Switch remux and direct stream 2020-02-23 00:05:28 +01:00
artiume
4becaf83dd
Update MediaInfoService.cs 2020-02-22 10:03:17 -05:00
artiume
a4e0364139
Update MediaInfoService.cs 2020-02-19 06:15:55 -05:00
artiume
b375aeb56a
fix indentation 
it was tabs
 2020-02-19 06:07:48 -05:00
artiume
63f13df6fc
Merge pull request #17 from jellyfin/master 
10.5
 2020-02-13 13:09:50 -05:00
Vasily
a26c1ab17d Remove commented code 2020-02-12 14:19:11 +03:00
Anthony Lavado
42066ee326
Merge branch 'master' into transcoding-throttling 2020-02-12 02:01:56 -05:00
artiume
b5342bb7d9
Fix MaxBitrate 2020-02-11 10:57:16 -05:00
artiume
a73ce1d781
Update MediaInfoService.cs 2020-02-06 17:21:10 -05:00
artiume
3b6a4c3a33
Merge pull request #11 from jellyfin/master 
nightly
 2020-02-04 06:02:38 -05:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
artiume
918df5e352 Merge remote-tracking branch 'jellyfin/master' 2020-01-26 09:33:31 -05:00
ThreeFive-O
4f3bfd9146 Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Denis
549a2d8b6d
Enable path mapping in PlaybackInfo endpoint 2020-01-17 22:48:28 +03:00
Bond-009
cf13e89ad6
Update MediaBrowser.Api/Playback/MediaInfoService.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-01-13 09:01:14 +01:00
Bond_009
84d1b12530 Attempt #2 2020-01-12 21:55:04 +01:00
Bond_009
da5893b0f1 Try to fix nullreff 2020-01-12 21:21:20 +01:00
dkanada
ce7744806c
Merge pull request #2216 from gnattu/master 
Let HLS fallback to mpegts in case device reports unsupported container
 2020-01-13 03:43:59 +09:00
gnattu
ea075c1b48
Add reminder to remove the workaround 
This will be no longer needed when ffmpeg is ready

Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-01-12 13:22:20 -05:00
dkanada
d217f1614e
Merge pull request #2096 from Bond-009/embytv 
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
 2020-01-13 00:41:52 +09:00
Maximilian Marschall
081d942d03 Enable Throttling when transcoding without Hardware-Acceleration 2020-01-12 00:33:57 +01:00
dkanada
a272638a84
Merge pull request #2170 from Bond-009/mediainfoservice 
Minor changes to MediaInfoService
 2020-01-11 16:54:23 +09:00
Bond_009
d9ec502ff9 Address comments 2020-01-10 21:25:45 +01:00
Bond_009
e714b9930e Merge branch 'master' into embytv 2020-01-10 21:16:46 +01:00
Artiume
a40cb7bbd8
Merge pull request #7 from jellyfin/master 
nightly
 2020-01-09 12:14:54 -05:00
gnattu
d5204f572a Fix typo and plural 2020-01-09 02:25:05 -05:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
gnattu
167549f5f1 Let HLS fallback to mpegts in case device reported unsupported container 2019-12-31 22:33:14 -05:00
Artiume
0e920a6d5f
Update MediaInfoService.cs 2019-12-20 23:40:36 -05:00
Artiume
963b69c7b2
Update MediaInfoService.cs 2019-12-20 23:17:01 -05:00
Bond_009
5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Artiume
6a6e02e1ec
Merge pull request #3 from jellyfin/master 
nightly, big one
 2019-12-19 20:51:45 -05:00
Bond-009
bb62dd14c2 Limit size for playbacktest 2019-12-19 17:46:17 +01:00
Vasily
06dfa2e687
Merge pull request #2134 from Bond-009/dlnam3u8 
Fix comparison between different types
 2019-12-19 18:51:51 +03:00
Bond-009
a5cd11735c Minor changes to MediaInfoService 2019-12-19 15:54:27 +01:00
dkanada
bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding 
Make probesize and analyzeduration configurable and simplify circular dependencies
 2019-12-18 08:54:40 +09:00