Commit graph

828 commits

Author SHA1 Message Date
crobibero
b3d322f79f Fix build after merge 2020-11-20 10:50:11 -07:00
crobibero
8f58f63b08 Merge remote-tracking branch 'upstream/master' into split-api 2020-11-20 10:35:46 -07:00
Joshua M. Boniface
7457c4a95d
Merge pull request #4499 from crobibero/more-param
Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids
2020-11-20 12:34:18 -05:00
Joshua M. Boniface
799eb44005
Merge pull request #4514 from Artiume/patch-9
Update FFmpeg log
2020-11-20 12:34:10 -05:00
Joshua M. Boniface
c901f1da41
Merge pull request #4518 from crobibero/livetv-hls
Fix live tv hls playback
2020-11-20 12:33:48 -05:00
Claus Vium
44ff7a4843
Apply suggestions from code review 2020-11-20 08:06:28 +01:00
nyanmisaka
b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +08:00
nyanmisaka
ca33ace3e9 rename 2020-11-20 09:57:28 +08:00
artiume
6a751251e7
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 19:45:26 -05:00
artiume
a46b70b169
Truncate GUID to 8 char 2020-11-19 19:23:04 -05:00
crobibero
d58e435409 Add response code documentation 2020-11-19 16:16:23 -07:00
crobibero
fe8531f74e Fix live tv hls playback 2020-11-19 16:15:20 -07:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
artiume
3423bdf53a
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 15:51:58 -05:00
Fernando Fernández
2deda0437d Review suggestions 2020-11-19 16:36:19 +01:00
nyanmisaka
20d6999d8c minor changes 2020-11-19 23:04:44 +08:00
Nyanmisaka
5ff08338d5
Apply suggestions from code review
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-19 15:02:36 +00:00
nyanmisaka
51dab0958d changes per suggestions 2020-11-19 22:46:02 +08:00
artiume
e6e7295320
oops 2020-11-19 08:58:16 -05:00
artiume
4e07d9d561
Update FFmpeg log 2020-11-19 08:49:21 -05:00
BaronGreenback
4c394eec90
Update Jellyfin.Api/Controllers/LiveTvController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-18 14:08:44 +00:00
Greenback
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
dkanada
742966573d
Merge pull request #4503 from jellyfin/cancellation
Pass cancellation where possible
2020-11-18 13:46:13 +09:00
crobibero
f6c6ee2008 Fix Environment authorization policy 2020-11-17 13:44:51 -07:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
crobibero
7bf647bb94 Remove precondition checks 2020-11-17 09:38:50 -07:00
crobibero
3b68ce1183 Fix build 2020-11-16 20:45:09 -07:00
crobibero
2a0578ce1a Add missing manual splits 2020-11-16 20:37:43 -07:00
crobibero
3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
nyanmisaka
099563cd6b comply with dotnet-5 2020-11-16 12:56:37 +08:00
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
crobibero
dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
crobibero
3f313206c6 Suggestions from review 2020-11-15 11:35:36 -07:00
crobibero
547ee88561 Remove api client generator errors 2020-11-15 10:58:39 -07:00
nyanmisaka
f953dd42be remove unused segment option 2020-11-16 01:09:14 +08:00
Bond_009
ff49a3bb61
Missed some stuff 2020-11-14 20:28:15 +01:00
Bond_009
c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009
bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
Claus Vium
569874a212
Merge pull request #4473 from crobibero/binder-no-throw
Don't throw exception when converting values using binder or JsonConv…
2020-11-14 17:31:52 +01:00
Cody Robibero
450cd614ac
Update Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-11-14 08:13:53 -07:00
nyanmisaka
e36725096a fix return type for GetAttachment 2020-11-14 22:28:22 +08:00
crobibero
cfefcd988a Updated based on review feedback 2020-11-14 07:07:09 -07:00
nyanmisaka
750eaa9d27 fix ci 2020-11-14 18:30:20 +08:00
Nyanmisaka
06670351ae
Apply suggestions from code review
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
2020-11-14 10:19:41 +00:00
nyanmisaka
fc89b7e641 minor changes 2020-11-14 16:02:16 +08:00
nyanmisaka
32bb73acbb add aac_adtstoasc bitstream filter for mpegts to mp4 conversion 2020-11-14 14:23:00 +08:00
crobibero
73d2cb1c2a Updated based on review feedback 2020-11-13 18:04:06 -07:00
nyanmisaka
f1e129f17a minor changes 2020-11-14 03:57:37 +08:00
nyanmisaka
8c0778e827 switch ffmpeg to hls muxer for live streaming
segment muxer cannot make fMP4 init file.
'-strict -2' option doesn't work with segment muxer for flac remuxing.
2020-11-14 03:47:54 +08:00