diff --git a/core/transcoder/codecs.go b/core/transcoder/codecs.go
index cb047014c..25564a908 100644
--- a/core/transcoder/codecs.go
+++ b/core/transcoder/codecs.go
@@ -16,6 +16,7 @@ type Codec interface {
 	DisplayName() string
 	GlobalFlags() string
 	PixelFormat() string
+	Scaler() string
 	ExtraArguments() string
 	ExtraFilters() string
 	VariantFlags(v *HLSVariant) string
@@ -53,6 +54,11 @@ func (c *Libx264Codec) PixelFormat() string {
 	return "yuv420p" //nolint:goconst
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *Libx264Codec) Scaler() string {
+	return ""
+}
+
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
 func (c *Libx264Codec) ExtraArguments() string {
 	return strings.Join([]string{
@@ -117,6 +123,11 @@ func (c *OmxCodec) PixelFormat() string {
 	return "yuv420p"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *OmxCodec) Scaler() string {
+	return ""
+}
+
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
 func (c *OmxCodec) ExtraArguments() string {
 	return strings.Join([]string{
@@ -170,6 +181,8 @@ func (c *VaapiCodec) DisplayName() string {
 // GlobalFlags are the global flags used with this codec in the transcoder.
 func (c *VaapiCodec) GlobalFlags() string {
 	flags := []string{
+		"-hwaccel", "vaapi",
+		"-hwaccel_output_format", "vaapi",
 		"-vaapi_device", "/dev/dri/renderD128",
 	}
 
@@ -181,9 +194,14 @@ func (c *VaapiCodec) PixelFormat() string {
 	return "vaapi_vld"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *VaapiCodec) Scaler() string {
+	return "scale_vaapi"
+}
+
 // ExtraFilters are the extra filters required for this codec in the transcoder.
 func (c *VaapiCodec) ExtraFilters() string {
-	return "format=nv12,hwupload"
+	return ""
 }
 
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
@@ -232,7 +250,7 @@ func (c *NvencCodec) DisplayName() string {
 // GlobalFlags are the global flags used with this codec in the transcoder.
 func (c *NvencCodec) GlobalFlags() string {
 	flags := []string{
-		"-hwaccel cuda",
+		"-hwaccel", "cuda",
 	}
 
 	return strings.Join(flags, " ")
@@ -243,6 +261,11 @@ func (c *NvencCodec) PixelFormat() string {
 	return "yuv420p"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *NvencCodec) Scaler() string {
+	return ""
+}
+
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
 func (c *NvencCodec) ExtraArguments() string {
 	return ""
@@ -302,6 +325,11 @@ func (c *QuicksyncCodec) PixelFormat() string {
 	return "nv12"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *QuicksyncCodec) Scaler() string {
+	return ""
+}
+
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
 func (c *QuicksyncCodec) ExtraArguments() string {
 	return ""
@@ -360,6 +388,11 @@ func (c *Video4Linux) PixelFormat() string {
 	return "nv21"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *Video4Linux) Scaler() string {
+	return ""
+}
+
 // ExtraArguments are the extra arguments used with this codec in the transcoder.
 func (c *Video4Linux) ExtraArguments() string {
 	return ""
@@ -419,6 +452,11 @@ func (c *VideoToolboxCodec) PixelFormat() string {
 	return "nv12"
 }
 
+// Scaler is the scaler used for resizing the video in the transcoder.
+func (c *VideoToolboxCodec) Scaler() string {
+	return ""
+}
+
 // ExtraFilters are the extra filters required for this codec in the transcoder.
 func (c *VideoToolboxCodec) ExtraFilters() string {
 	return ""
diff --git a/core/transcoder/transcoder.go b/core/transcoder/transcoder.go
index 6de2e310b..7a84d3714 100644
--- a/core/transcoder/transcoder.go
+++ b/core/transcoder/transcoder.go
@@ -304,7 +304,7 @@ func (v *HLSVariant) getVariantString(t *Transcoder) string {
 	if (v.videoSize.Width != 0 || v.videoSize.Height != 0) && !v.isVideoPassthrough {
 		// Order here matters, you must scale before changing hardware formats
 		filters := []string{
-			v.getScalingString(),
+			v.getScalingString(t.codec.Scaler()),
 		}
 		if t.codec.ExtraFilters() != "" {
 			filters = append(filters, t.codec.ExtraFilters())
@@ -355,8 +355,11 @@ func (v *HLSVariant) SetVideoScalingHeight(height int) {
 	v.videoSize.Height = height
 }
 
-func (v *HLSVariant) getScalingString() string {
-	return fmt.Sprintf("scale=%s", v.videoSize.getString())
+func (v *HLSVariant) getScalingString(scaler string) string {
+	if scaler == "" {
+		scaler = "scale"
+	}
+	return fmt.Sprintf("%s=%s", scaler, v.videoSize.getString())
 }
 
 // Video Quality
diff --git a/core/transcoder/transcoder_vaapi_test.go b/core/transcoder/transcoder_vaapi_test.go
index d377c2efb..affa7fcac 100644
--- a/core/transcoder/transcoder_vaapi_test.go
+++ b/core/transcoder/transcoder_vaapi_test.go
@@ -42,7 +42,7 @@ func TestFFmpegVaapiCommand(t *testing.T) {
 	cmd := transcoder.getString()
 
 	expectedLogPath := filepath.Join("data", "logs", "transcoder.log")
-	expected := `FFREPORT=file="` + expectedLogPath + `":level=32 ` + transcoder.ffmpegPath + ` -hide_banner -loglevel warning -vaapi_device /dev/dri/renderD128 -fflags +genpts -flags +cgop -i  fakecontent.flv  -map v:0 -c:v:0 h264_vaapi -b:v:0 1008k -maxrate:v:0 1088k -g:v:0 90 -keyint_min:v:0 90 -r:v:0 30  -map a:0? -c:a:0 copy -filter:v:0 "format=nv12,hwupload" -preset veryfast -map v:0 -c:v:1 h264_vaapi -b:v:1 3308k -maxrate:v:1 3572k -g:v:1 72 -keyint_min:v:1 72 -r:v:1 24  -map a:0? -c:a:1 copy -filter:v:1 "format=nv12,hwupload" -preset fast -map v:0 -c:v:2 copy -map a:0? -c:a:2 copy -preset ultrafast  -var_stream_map "v:0,a:0 v:1,a:1 v:2,a:2 " -f hls -hls_time 3 -hls_list_size 10 -hls_flags program_date_time+independent_segments+omit_endlist  -segment_format_options mpegts_flags=mpegts_copyts=1  -pix_fmt vaapi_vld -sc_threshold 0 -master_pl_name stream.m3u8 -hls_segment_filename http://127.0.0.1:8123/%v/stream-jdofFGg-%d.ts -max_muxing_queue_size 400 -method PUT http://127.0.0.1:8123/%v/stream.m3u8`
+	expected := `FFREPORT=file="` + expectedLogPath + `":level=32 ` + transcoder.ffmpegPath + ` -hide_banner -loglevel warning -hwaccel vaapi -hwaccel_output_format vaapi -vaapi_device /dev/dri/renderD128 -fflags +genpts -flags +cgop -i  fakecontent.flv  -map v:0 -c:v:0 h264_vaapi -b:v:0 1008k -maxrate:v:0 1088k -g:v:0 90 -keyint_min:v:0 90 -r:v:0 30  -map a:0? -c:a:0 copy -preset veryfast -map v:0 -c:v:1 h264_vaapi -b:v:1 3308k -maxrate:v:1 3572k -g:v:1 72 -keyint_min:v:1 72 -r:v:1 24  -map a:0? -c:a:1 copy -preset fast -map v:0 -c:v:2 copy -map a:0? -c:a:2 copy -preset ultrafast  -var_stream_map "v:0,a:0 v:1,a:1 v:2,a:2 " -f hls -hls_time 3 -hls_list_size 10 -hls_flags program_date_time+independent_segments+omit_endlist  -segment_format_options mpegts_flags=mpegts_copyts=1  -pix_fmt vaapi_vld -sc_threshold 0 -master_pl_name stream.m3u8 -hls_segment_filename http://127.0.0.1:8123/%v/stream-jdofFGg-%d.ts -max_muxing_queue_size 400 -method PUT http://127.0.0.1:8123/%v/stream.m3u8`
 
 	if cmd != expected {
 		t.Errorf("ffmpeg command does not match expected.\nGot %s\n, want: %s", cmd, expected)