yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared

Browse source
This commit is contained in:
buoyantair 2018-11-20 12:28:13 +05:30
commit bc22d60899
41 changed files with 186 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/tests/api/videos/video-transcoder.ts
View file

@ -3,13 +3,13 @@
import * as chai from 'chai'
import 'mocha'
import { omit } from 'lodash'
import * as ffmpeg from 'fluent-ffmpeg'
import { getMaxBitrate, VideoDetails, VideoResolution, VideoState } from '../../../../shared/models/videos'
import { audio, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
import {
buildAbsoluteFixturePath,
doubleFollow,
flushAndRunMultipleServers,
generateHighBitrateVideo,
getMyVideos,
getVideo,
getVideosList,
@ -18,8 +18,7 @@ import {
ServerInfo,
setAccessTokensToServers,
uploadVideo,
webtorrentAdd,
generateHighBitrateVideo
webtorrentAdd
} from '../../../../shared/utils'
import { join } from 'path'
import { waitJobs } from '../../../../shared/utils/server/jobs'