diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-07-12 10:37:59 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-07-12 10:37:59 +0200 |
| commit | 88cde4392a27d5d37685a471f9bf83d537282c43 (patch) | |
| tree | 531b8bf3c93de538987e563178dab90fda353b1d /server/lib/transcoding | |
| parent | 97f57e928fafb715d0763e97c7a3e6fd454a0bfc (diff) | |
| parent | ed22eaabfac0d53550cd838c12b7d80e01bcc7b5 (diff) | |
| download | PeerTube-88cde4392a27d5d37685a471f9bf83d537282c43.tar.gz PeerTube-88cde4392a27d5d37685a471f9bf83d537282c43.tar.zst PeerTube-88cde4392a27d5d37685a471f9bf83d537282c43.zip | |
Merge branch 'release/5.2.0' into develop
Diffstat (limited to 'server/lib/transcoding')
| -rw-r--r-- | server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts b/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts index c0a45f40e..f0671bd7a 100644 --- a/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts +++ b/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts | |||
| @@ -115,7 +115,7 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder { | |||
| 115 | 115 | ||
| 116 | for (const resolution of childrenResolutions) { | 116 | for (const resolution of childrenResolutions) { |
| 117 | const dependsOnRunnerJob = mainJob | 117 | const dependsOnRunnerJob = mainJob |
| 118 | const fps = computeOutputFPS({ inputFPS, resolution: maxResolution }) | 118 | const fps = computeOutputFPS({ inputFPS, resolution }) |
| 119 | 119 | ||
| 120 | if (transcodingType === 'hls') { | 120 | if (transcodingType === 'hls') { |
| 121 | await new VODHLSTranscodingJobHandler().create({ | 121 | await new VODHLSTranscodingJobHandler().create({ |