aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api/videos
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-02-01 11:16:45 +0100
committerChocobozzz <me@florianbigard.com>2022-02-01 11:27:38 +0100
commit0f11ec8dd32b50897c18588db948e96cf0fc2c70 (patch)
tree49be9328b4dd5ac8d989ccbe157f494d85246618 /server/controllers/api/videos
parent3e8c3fcdb063e2d8f4b3ba04fdcdeda588538751 (diff)
downloadPeerTube-0f11ec8dd32b50897c18588db948e96cf0fc2c70.tar.gz
PeerTube-0f11ec8dd32b50897c18588db948e96cf0fc2c70.tar.zst
PeerTube-0f11ec8dd32b50897c18588db948e96cf0fc2c70.zip
Prevent HLS transcoding after webtorrent transcoding
Diffstat (limited to 'server/controllers/api/videos')
-rw-r--r--server/controllers/api/videos/transcoding.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/server/controllers/api/videos/transcoding.ts b/server/controllers/api/videos/transcoding.ts
index 388689c8a..fba4545c2 100644
--- a/server/controllers/api/videos/transcoding.ts
+++ b/server/controllers/api/videos/transcoding.ts
@@ -25,7 +25,7 @@ export {
25 25
26async function createTranscoding (req: express.Request, res: express.Response) { 26async function createTranscoding (req: express.Request, res: express.Response) {
27 const video = res.locals.videoAll 27 const video = res.locals.videoAll
28 logger.info('Creating %s transcoding job for %s.', req.body.type, video.url, lTags()) 28 logger.info('Creating %s transcoding job for %s.', req.body.transcodingType, video.url, lTags())
29 29
30 const body: VideoTranscodingCreate = req.body 30 const body: VideoTranscodingCreate = req.body
31 31
@@ -53,8 +53,9 @@ async function createTranscoding (req: express.Request, res: express.Response) {
53 type: 'new-resolution-to-webtorrent', 53 type: 'new-resolution-to-webtorrent',
54 videoUUID: video.uuid, 54 videoUUID: video.uuid,
55 isNewVideo: false, 55 isNewVideo: false,
56 resolution: resolution, 56 resolution,
57 hasAudio: !!audioStream, 57 hasAudio: !!audioStream,
58 createHLSIfNeeded: false,
58 isPortraitMode 59 isPortraitMode
59 }) 60 })
60 } 61 }