diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-08 13:08:34 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-08 13:14:02 +0200 |
commit | b7c8304cfd954846852f47430ecf03f39ce85099 (patch) | |
tree | cf932754089ff37b2ff2c1addb40c22eeb19582e /server | |
parent | 37ede348bb553d7065e919a1fc20039f49d395b7 (diff) | |
download | PeerTube-b7c8304cfd954846852f47430ecf03f39ce85099.tar.gz PeerTube-b7c8304cfd954846852f47430ecf03f39ce85099.tar.zst PeerTube-b7c8304cfd954846852f47430ecf03f39ce85099.zip |
Fix toEven
Diffstat (limited to 'server')
-rw-r--r-- | server/helpers/core-utils.ts | 2 | ||||
-rw-r--r-- | server/helpers/ffmpeg-utils.ts | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index f7e6fdddc..9abc532d2 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts | |||
@@ -248,7 +248,7 @@ function isOdd (num: number) { | |||
248 | } | 248 | } |
249 | 249 | ||
250 | function toEven (num: number) { | 250 | function toEven (num: number) { |
251 | if (isOdd) return num + 1 | 251 | if (isOdd(num)) return num + 1 |
252 | 252 | ||
253 | return num | 253 | return num |
254 | } | 254 | } |
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index d20ca5d56..585230e2d 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts | |||
@@ -3,14 +3,12 @@ import * as ffmpeg from 'fluent-ffmpeg' | |||
3 | import { readFile, remove, writeFile } from 'fs-extra' | 3 | import { readFile, remove, writeFile } from 'fs-extra' |
4 | import { dirname, join } from 'path' | 4 | import { dirname, join } from 'path' |
5 | import { FFMPEG_NICE, VIDEO_LIVE } from '@server/initializers/constants' | 5 | import { FFMPEG_NICE, VIDEO_LIVE } from '@server/initializers/constants' |
6 | import { AvailableEncoders, EncoderOptionsBuilder, EncoderOptions, EncoderProfile, VideoResolution } from '../../shared/models/videos' | 6 | import { AvailableEncoders, EncoderOptions, EncoderOptionsBuilder, EncoderProfile, VideoResolution } from '../../shared/models/videos' |
7 | import { CONFIG } from '../initializers/config' | 7 | import { CONFIG } from '../initializers/config' |
8 | import { execPromise, isOdd, promisify0 } from './core-utils' | 8 | import { execPromise, promisify0 } from './core-utils' |
9 | import { computeFPS, getAudioStream, getVideoFileFPS } from './ffprobe-utils' | 9 | import { computeFPS, getAudioStream, getVideoFileFPS } from './ffprobe-utils' |
10 | import { processImage } from './image-utils' | 10 | import { processImage } from './image-utils' |
11 | import { logger } from './logger' | 11 | import { logger } from './logger' |
12 | import { FilterSpecification } from 'fluent-ffmpeg' | ||
13 | import { findCommentId } from '@shared/extra-utils' | ||
14 | 12 | ||
15 | /** | 13 | /** |
16 | * | 14 | * |