LogicalPhallacy
404bd04cbc
Merge pull request #8 from jellyfin/master
...
rebase to latest master
2019-01-23 00:31:35 -08:00
Andrew Rabert
e05e002b8b
Merge pull request #677 from nvllsvm/fixdocker
...
Fix arm32 Docker
2019-01-22 20:11:30 -05:00
Andrew Rabert
ede0439b12
Fix arm32 Docker
2019-01-22 20:04:40 -05:00
Andrew Rabert
28483bdb54
Merge pull request #651 from jellyfin/release-10.1.0
...
Release 10.1.0
2019-01-22 18:13:47 -05:00
Joshua Boniface
8106c8393b
Update jellyfin-web submodule to 10.1.0
2019-01-22 13:16:42 -05:00
Joshua Boniface
411139cd78
Update changelogs to add #666
2019-01-21 23:56:02 -05:00
Anthony Lavado
29f3330091
Merge pull request #666 from nvllsvm/cross-platform
...
Add cross-platform build for arm64
2019-01-21 23:55:17 -05:00
Andrew Rabert
8108e295dc
Add Dockerfile.arm64 docs
2019-01-21 23:43:13 -05:00
Andrew Rabert
aa25dd1a0b
Update to .NETCore 3.0
2019-01-21 23:17:56 -05:00
Andrew Rabert
23c52c3fb9
Disable cross-platform build for arm32v7
...
https://github.com/jellyfin/jellyfin/issues/665
2019-01-21 23:17:30 -05:00
Andrew Rabert
a5aa482b6c
Update arm/arm64 images to build cross-platform
...
These Dockerfiles can not be built natively - must be built on x86_64
2019-01-21 22:47:51 -05:00
Joshua Boniface
8d298e0e36
Update changelogs to remove #639 , add #661 , #54
2019-01-21 21:24:28 -05:00
Andrew Rabert
13f1ea2c19
Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1
...
Revert "Fix segment_time_delta for ffmpeg 4.1"
2019-01-21 20:21:36 -05:00
Andrew Rabert
9ad182502f
Merge pull request #661 from Bond-009/streamstate
...
Fix NullRef from progress report
2019-01-21 20:05:43 -05:00
Joshua M. Boniface
b2767eceff
Revert "Fix segment_time_delta for ffmpeg 4.1"
2019-01-21 19:29:47 -05:00
Bond_009
73df5bdbe9
Fix NullRef
2019-01-21 23:50:47 +01:00
Joshua Boniface
e6b95db132
Add jellyfin-web#53 to changelogs
2019-01-21 16:34:53 -05:00
Joshua Boniface
e30cf63aef
Add helpful time text around platform builds
2019-01-21 16:34:53 -05:00
Joshua M. Boniface
571afa4fe2
Merge pull request #655 from joshuaboniface/local-web-branch
...
Support trying local branches in submodule
2019-01-21 13:28:40 -05:00
Joshua Boniface
42f2799d66
Add jellyfin-web#52 to changelogs
2019-01-21 13:25:26 -05:00
Joshua Boniface
384f867228
Update changelogs to include this PR
2019-01-21 12:57:46 -05:00
Joshua Boniface
cf85e2327e
Support trying local branches in submodule
2019-01-21 12:48:27 -05:00
Joshua Boniface
0dab69b551
Use basename for cross-platform operation
...
Trying to sed out the deployment/ failed on MacOS, so use the
basename command instead for the same effect.
2019-01-21 01:42:25 -05:00
Joshua Boniface
ff4cbfc6df
Fix inconsistencies in changelogs
2019-01-21 00:02:56 -05:00
Joshua Boniface
c72144111e
Correct bad signature line
2019-01-21 00:02:56 -05:00
Joshua M. Boniface
3518400b22
Merge branch 'master' into release-10.1.0
2019-01-20 23:48:23 -05:00
Joshua Boniface
adf037c44c
Complete and remove todo from bump_version
2019-01-20 23:41:37 -05:00
Joshua Boniface
73038ee3f7
Bump version to 10.1.0
2019-01-20 23:39:55 -05:00
Andrew Rabert
920c39454c
Merge pull request #646 from Tthecreator/master
...
Fix infinite loop bug on subtitle.m3u8 request
2019-01-20 21:16:28 -05:00
Andrew Rabert
edcfd8b565
Merge pull request #631 from Bond-009/imagesize
...
Cleanup ImageProcessor and SkiaEncoder
2019-01-20 20:49:51 -05:00
Andrew Rabert
7327bb91a3
Fix func name
2019-01-20 20:48:24 -05:00
Andrew Rabert
6a5488c651
Formatting
2019-01-20 20:47:02 -05:00
Andrew Rabert
1cf1e9bfa1
Update appPaths position
2019-01-20 20:46:40 -05:00
Andrew Rabert
7469ed4e6e
Update logger position
2019-01-20 20:46:00 -05:00
Andrew Rabert
c7f648f86a
Merge branch 'dev' into imagesize
2019-01-20 20:45:06 -05:00
Tthecreator
3069c749b4
Added myself to contributers
2019-01-21 00:40:59 +01:00
Tthecreator
d02642bf7b
Fixed bug where the server would eat up ram with subtitles request
2019-01-21 00:38:01 +01:00
Andrew Rabert
803bf563d7
Merge pull request #621 from Bond-009/perf
...
Minor improvements to library scan code
2019-01-20 18:13:49 -05:00
Andrew Rabert
d16f38dbe1
Merge pull request #623 from wtayl0r/inject-logger-factories
...
Replaced injections of ILogger with ILoggerFactory
2019-01-20 18:12:50 -05:00
Andrew Rabert
e8813ced3c
Merge pull request #638 from EraYaN/clean-test-files
...
Removed XmlTv testfiles and nuget install
2019-01-20 18:12:10 -05:00
Andrew Rabert
a1fcf4ea0d
Merge pull request #613 from MatMaul/mediaencoding-dev
...
Update MediaEncoding
2019-01-20 18:11:51 -05:00
Andrew Rabert
c8dd72886b
Merge pull request #636 from cvium/fix_subtitle_conversion_direct_streaming
...
Allow subtitle extraction and conversion in direct streaming
2019-01-20 16:59:16 -05:00
Andrew Rabert
c64cc733d2
Merge pull request #639 from Bond-009/ffmpeg4.1
...
Fix segment_time_delta for ffmpeg 4.1
2019-01-20 16:55:45 -05:00
William Taylor
190bc46c1b
Removed unused parameters from Program.getImageEncoder
2019-01-20 21:54:07 +00:00
Mathieu Velten
ae73f7b3e3
Fix transcoding bitrate
2019-01-20 22:50:17 +01:00
Mathieu Velten
060eb98cc5
Fix encoding profile handling for vaapi
2019-01-20 22:50:17 +01:00
Mathieu Velten
da16de48aa
Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding
...
Remove some duplicate code that were causing warnings
2019-01-20 22:50:09 +01:00
William Taylor
e62198650e
Updated param name
2019-01-20 21:05:12 +00:00
William Taylor
88f13492c7
Added myself to contributors.md
2019-01-20 21:05:12 +00:00
William Taylor
65cd3ed597
Replaced injections of ILogger with ILoggerFactory
...
This makes resolving dependencies from the container much easier as
you cannot resolve with primitives parameters in a way that is any
more readable.
The aim of this commit is to change as little as possible with the end
result, loggers that were newed up for the parent object were given the same
name. Objects that used the base or app loggers, were given a new logger with
an appropriate name.
Also removed some unused dependencies.
2019-01-20 21:05:12 +00:00
