Merge branch 'release/3.4.0' into develop

author Chocobozzz <me@florianbigard.com>

Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)

committer Chocobozzz <me@florianbigard.com>

Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)
author Chocobozzz <me@florianbigard.com>
Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)
committer Chocobozzz <me@florianbigard.com>
Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)
diff --cc server/lib/transcoding/video-transcoding-profiles.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Mon, 11 Oct 2021 14:00:39 +0000 (16:00 +0200)