Commit Graph

12633 Commits (a30687a15ae216f027d21813a32aab41b987eea8)
 

Author SHA1 Message Date
Phallacy a30687a15a Quick fix to erroring build scripts and pulling the supported ffmpeg
6 years ago
LogicalPhallacy 404bd04cbc Merge pull request #8 from jellyfin/master
6 years ago
Andrew Rabert e05e002b8b Merge pull request #677 from nvllsvm/fixdocker
6 years ago
Andrew Rabert ede0439b12 Fix arm32 Docker
6 years ago
Andrew Rabert 28483bdb54 Merge pull request #651 from jellyfin/release-10.1.0
6 years ago
Joshua Boniface 8106c8393b Update jellyfin-web submodule to 10.1.0
6 years ago
Joshua Boniface 411139cd78 Update changelogs to add #666
6 years ago
Anthony Lavado 29f3330091 Merge pull request #666 from nvllsvm/cross-platform
6 years ago
Andrew Rabert 8108e295dc Add Dockerfile.arm64 docs
6 years ago
Andrew Rabert aa25dd1a0b Update to .NETCore 3.0
6 years ago
Andrew Rabert 23c52c3fb9 Disable cross-platform build for arm32v7
6 years ago
Andrew Rabert a5aa482b6c Update arm/arm64 images to build cross-platform
6 years ago
Joshua Boniface 8d298e0e36 Update changelogs to remove #639, add #661, #54
6 years ago
Andrew Rabert 13f1ea2c19 Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1
6 years ago
Andrew Rabert 9ad182502f Merge pull request #661 from Bond-009/streamstate
6 years ago
Joshua M. Boniface b2767eceff Revert "Fix segment_time_delta for ffmpeg 4.1"
6 years ago
Bond_009 73df5bdbe9 Fix NullRef
6 years ago
Joshua Boniface e6b95db132 Add jellyfin-web#53 to changelogs
6 years ago
Joshua Boniface e30cf63aef Add helpful time text around platform builds
6 years ago
Joshua M. Boniface 571afa4fe2 Merge pull request #655 from joshuaboniface/local-web-branch
6 years ago
Joshua Boniface 42f2799d66 Add jellyfin-web#52 to changelogs
6 years ago
Joshua Boniface 384f867228 Update changelogs to include this PR
6 years ago
Joshua Boniface cf85e2327e Support trying local branches in submodule
6 years ago
Joshua Boniface 0dab69b551 Use basename for cross-platform operation
6 years ago
Joshua Boniface ff4cbfc6df Fix inconsistencies in changelogs
6 years ago
Joshua Boniface c72144111e Correct bad signature line
6 years ago
Joshua M. Boniface 3518400b22 Merge branch 'master' into release-10.1.0
6 years ago
Joshua Boniface adf037c44c Complete and remove todo from bump_version
6 years ago
Joshua Boniface 73038ee3f7 Bump version to 10.1.0
6 years ago
Andrew Rabert 920c39454c Merge pull request #646 from Tthecreator/master
6 years ago
Andrew Rabert edcfd8b565 Merge pull request #631 from Bond-009/imagesize
6 years ago
Andrew Rabert 7327bb91a3 Fix func name
6 years ago
Andrew Rabert 6a5488c651 Formatting
6 years ago
Andrew Rabert 1cf1e9bfa1 Update appPaths position
6 years ago
Andrew Rabert 7469ed4e6e Update logger position
6 years ago
Andrew Rabert c7f648f86a Merge branch 'dev' into imagesize
6 years ago
Tthecreator 3069c749b4 Added myself to contributers
6 years ago
Tthecreator d02642bf7b Fixed bug where the server would eat up ram with subtitles request
6 years ago
Andrew Rabert 803bf563d7 Merge pull request #621 from Bond-009/perf
6 years ago
Andrew Rabert d16f38dbe1 Merge pull request #623 from wtayl0r/inject-logger-factories
6 years ago
Andrew Rabert e8813ced3c Merge pull request #638 from EraYaN/clean-test-files
6 years ago
Andrew Rabert a1fcf4ea0d Merge pull request #613 from MatMaul/mediaencoding-dev
6 years ago
Andrew Rabert c8dd72886b Merge pull request #636 from cvium/fix_subtitle_conversion_direct_streaming
6 years ago
Andrew Rabert c64cc733d2 Merge pull request #639 from Bond-009/ffmpeg4.1
6 years ago
William Taylor 190bc46c1b Removed unused parameters from Program.getImageEncoder
6 years ago
Mathieu Velten ae73f7b3e3 Fix transcoding bitrate
6 years ago
Mathieu Velten 060eb98cc5 Fix encoding profile handling for vaapi
6 years ago
Mathieu Velten da16de48aa Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding
6 years ago
William Taylor e62198650e Updated param name
6 years ago
William Taylor 88f13492c7 Added myself to contributors.md
6 years ago