Commit Graph

2625 Commits

Author SHA1 Message Date
artiume
697aee5b0c
Merge pull request #21 from jellyfin/master
nightly
2020-02-23 10:57:52 -05: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
dkanada
61015c1d0f
Merge pull request #2321 from Bond-009/images
Simplify image processing by removing image enhancers
2020-02-21 12:32:54 +09: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
967f8c6dcd
Merge pull request #18 from jellyfin/master
nightly
2020-02-19 06:02:26 -05:00
artiume
63f13df6fc
Merge pull request #17 from jellyfin/master
10.5
2020-02-13 13:09:50 -05:00
dkanada
53db526667 merge branch master into refactor 2020-02-14 03:02:06 +09:00
artiume
40ad6f843f
Merge pull request #16 from jellyfin/master
nightly
2020-02-13 05:53:23 -05:00
Bond-009
a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01: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
Anthony Lavado
00073c162a
Merge pull request #2363 from dkanada/view
Add session view endpoint
2020-02-11 23:56:47 -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
dkanada
1cb51a8ac7 rename session folder 2020-02-06 00:47:50 +09:00
dkanada
c2733ac0dc split api keys into their own service 2020-02-06 00:26:21 +09:00
artiume
3b6a4c3a33
Merge pull request #11 from jellyfin/master
nightly
2020-02-04 06:02:38 -05:00
dkanada
b7a9900556
Merge pull request #2357 from Bond-009/warn13
Fix warnings
2020-02-03 17:15:03 +09:00
dkanada
1bc8ca2542 add session view endpoint 2020-02-02 00:16:11 +09:00
dkanada
6341d986a9 fix a few warnings 2020-02-02 00:07:46 +09:00
dkanada
692a9bfdd0
update some comments
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-02-01 23:36:40 +09:00
dkanada
afe9ed977b improve scan progress and fix a few bugs 2020-02-01 22:44:27 +09: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
Bond_009
ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +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
73fac50e57 rename two properties based on code suggestions 2020-01-08 10:52:48 +09:00
Bond_009
a253fa616d Fix build and address comments 2020-01-08 01:23:57 +09:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Artiume
5b55997984
Merge pull request #6 from jellyfin/master
nightly
2020-01-05 11:49:45 -05:00
dkanada
529cff3920
Merge pull request #2153 from dkanada/fix-playlist
Fix playlist deletion and a few warning fixes
2020-01-01 15:00:57 +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