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 |
|
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 |
|
Artiume
|
f3e7c72bac
|
Update MediaInfoService.cs
|
2019-12-16 15:22:18 -05:00 |
|
Artiume
|
b31f4ccbc2
|
Update MediaInfoService.cs
|
2019-12-16 14:53:42 -05:00 |
|
Artiume
|
46442e24f8
|
Update MediaInfoService.cs
|
2019-12-16 00:43:03 -05:00 |
|
Artiume
|
3fb7aabfde
|
Update MediaInfoService.cs
|
2019-12-16 00:40:25 -05:00 |
|
Artiume
|
64c313a8fb
|
Update MediaInfoService.cs
|
2019-12-16 00:27:48 -05:00 |
|
Artiume
|
be956dfd02
|
Update MediaInfoService.cs
|
2019-12-15 23:52:07 -05:00 |
|
dkanada
|
61b9845e0f
|
Merge pull request #2099 from cryptobank/master
Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to...
|
2019-12-15 19:54:20 +09:00 |
|
cryptobank
|
f18d3ed33b
|
Formatting fix (3)
Co-Authored-By: Bond-009 <bond.009@outlook.com>
|
2019-12-14 11:27:41 +10:30 |
|
Bond_009
|
0bf8bfbb0c
|
Merge branch 'master' into mediaencoding
|
2019-12-10 23:00:59 +01:00 |
|
Bond-009
|
b20b648659
|
Fix comparison between different types
|
2019-12-10 17:25:21 +01:00 |
|
Bond-009
|
19844a2c2a
|
Fix typo
|
2019-12-10 17:07:23 +01:00 |
|
cryptobank
|
5b5d527a09
|
Use string.Equals instead of of equals operator
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
|
2019-12-07 06:47:57 +10:30 |
|