diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-05-05 12:15:16 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-05-05 12:15:16 +0200 |
| commit | 62326afb151a1062253ac8b08bb62ce3f01e1267 (patch) | |
| tree | 0ab9950e84bdcc935e3c3531d061762eea2c0075 /server/controllers | |
| parent | fce897f326af14406ced2f71a00ae89ff297a550 (diff) | |
| download | PeerTube-62326afb151a1062253ac8b08bb62ce3f01e1267.tar.gz PeerTube-62326afb151a1062253ac8b08bb62ce3f01e1267.tar.zst PeerTube-62326afb151a1062253ac8b08bb62ce3f01e1267.zip | |
Server: Fix video propagation with transcoding enabled
Diffstat (limited to 'server/controllers')
| -rw-r--r-- | server/controllers/api/videos.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js index 0be7d9d83..4a4c5e162 100644 --- a/server/controllers/api/videos.js +++ b/server/controllers/api/videos.js | |||
| @@ -379,6 +379,9 @@ function addVideo (req, res, videoFile, finalCallback) { | |||
| 379 | }, | 379 | }, |
| 380 | 380 | ||
| 381 | function sendToFriends (t, video, callback) { | 381 | function sendToFriends (t, video, callback) { |
| 382 | // Let transcoding job send the video to friends because the videofile extension might change | ||
| 383 | if (constants.CONFIG.TRANSCODING.ENABLED === true) return callback(null, t) | ||
| 384 | |||
| 382 | video.toAddRemoteJSON(function (err, remoteVideo) { | 385 | video.toAddRemoteJSON(function (err, remoteVideo) { |
| 383 | if (err) return callback(err) | 386 | if (err) return callback(err) |
| 384 | 387 | ||