diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
| commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
| tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /server/helpers/ffmpeg-utils.ts | |
| parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
| parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
| download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip | |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'server/helpers/ffmpeg-utils.ts')
| -rw-r--r-- | server/helpers/ffmpeg-utils.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index 8b9045038..b59e7e40e 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | import * as ffmpeg from 'fluent-ffmpeg' | 1 | import * as ffmpeg from 'fluent-ffmpeg' |
| 2 | import { join } from 'path' | 2 | import { join } from 'path' |
| 3 | import { getTargetBitrate, VideoResolution } from '../../shared/models/videos' | 3 | import { getTargetBitrate, VideoResolution } from '../../shared/models/videos' |
| 4 | import { CONFIG, FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers' | 4 | import { CONFIG, FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers/constants' |
| 5 | import { processImage } from './image-utils' | 5 | import { processImage } from './image-utils' |
| 6 | import { logger } from './logger' | 6 | import { logger } from './logger' |
| 7 | import { checkFFmpegEncoders } from '../initializers/checker-before-init' | 7 | import { checkFFmpegEncoders } from '../initializers/checker-before-init' |