Commit Graph

33 Commits

Author SHA1 Message Date
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
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01: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
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
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
nyanmisaka
f953dd42be remove unused segment option 2020-11-16 01:09:14 +08: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
crobibero
95ebb9a55a Use null coalescing when possible 2020-11-13 11:24:46 -07:00
crobibero
5f52a58e78 Convert NullReferenceException to ResourceNotFoundException 2020-11-13 11:14:44 -07:00
crobibero
01355e0498 Fix nullability errors in Jellyfin.Api (part 1) 2020-11-13 09:04:31 -07:00
Cody Robibero
96071ef30d
Move slash to correct location for quoting 2020-10-28 20:26:33 -06:00
crobibero
c0383ba07d Add missing slashes in ffmpeg argument. 2020-10-28 20:23:39 -06:00
crobibero
eab92a0b01 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-06 14:34:31 -06:00
crobibero
29fc882037 merge all attributes 2020-09-06 09:07:27 -06:00
crobibero
b64108923a Add missing references 2020-09-05 17:11:44 -06:00
crobibero
59d47ec3f5 Make all FromRoute required 2020-09-05 17:07:25 -06:00
crobibero
2f33bee2a9 Set openapi schema type to file where possible 2020-09-01 17:26:49 -06:00
crobibero
858aecd409 Fix all route for base url support 2020-08-04 12:48:53 -06:00
crobibero
8bb510a9f6 Specify Logger type 2020-08-03 13:16:29 -06:00
David
d6c428e998
Update Jellyfin.Api/Controllers/VideoHlsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-31 17:26:14 +02:00
David
8a016e31f7 Move VideoHlsService to Jellyfin.Api 2020-07-31 17:09:10 +02:00