diff --git a/doc/benchmarks/intel-iris-xe-max-graphics/intel-iris-xe-max-graphics.md b/doc/benchmarks/intel-iris-xe-max-graphics/intel-iris-xe-max-graphics.md
index 42f4e6a..8bd2665 100644
--- a/doc/benchmarks/intel-iris-xe-max-graphics/intel-iris-xe-max-graphics.md
+++ b/doc/benchmarks/intel-iris-xe-max-graphics/intel-iris-xe-max-graphics.md
@@ -109,7 +109,7 @@ streams using pyramid coding and other quality optimizations.
 **Example 1: AVC VBR Encode**
 
 ```sh
-ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
   -i $input -vframes $nframes -y \
   -c:v h264_qsv -preset medium -profile:v high \
   -b:v $bitrate -maxrate $(bitrate*2) -bitrate_limit 0 \
@@ -120,7 +120,7 @@ ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
 **Example 2: AVC CBR Encode**
 
 ```sh
-ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
   -i $input -vframes $nframes -y \
   -c:v h264_qsv -preset medium -profile:v high \
   -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bitrate_limit 0 \
@@ -131,7 +131,7 @@ ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
 **Example 3: HEVC VBR Encode**
 
 ```sh
-ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
   -i $input -vframes $nframes -y \
   -c:v hevc_qsv -preset medium -profile:v main \
   -b:v $bitrate -maxrate $(bitrate*2) -bitrate_limit 0 \
@@ -142,7 +142,7 @@ ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
 **Example 4: HEVC CBR Encode**
 
 ```sh
-ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \ 
+ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \ 
   -i $input -vframes $nframes -y \
   -c:v hevc_qsv -preset medium -profile:v main \
   -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bitrate_limit 0 \
diff --git a/doc/quality-lowdelay.rst b/doc/quality-lowdelay.rst
index 12f0ed3..5030447 100644
--- a/doc/quality-lowdelay.rst
+++ b/doc/quality-lowdelay.rst
@@ -270,7 +270,7 @@ To achieve better quality for low delay use case with Intel GPU H.264/AVC encode
 
   # LD CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v h264_qsv -preset $preset -profile:v high -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((bitrate / 4)) \
     -rc_init_occupancy $((bitrate / 8)) -bitrate_limit 0 -low_power ${LOW_POWER:-true} \
@@ -327,7 +327,7 @@ Example command lines:
 
   # LD CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v hevc_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((bitrate / 4)) \
     -rc_init_occupancy $((bitrate / 8)) -low_power ${LOW_POWER:-true} \
@@ -379,7 +379,7 @@ Example command lines:
 
   # LD CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v av1_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((bitrate / 2)) -rc_init_occupancy $((bitrate / 4)) \
     -bf 0 -g 9999 -fps_mode passthrough -y $output
@@ -416,7 +416,7 @@ ffmpeg-x264
 ::
 
   # LD CBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx264 -preset medium -profile:v high \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((bitrate / N)) \
@@ -428,7 +428,7 @@ ffmpeg-x265
 ::
 
   # LD CBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx265 -preset medium \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((bitrate / N)) \
diff --git a/doc/quality.rst b/doc/quality.rst
index ff9a101..1e39242 100644
--- a/doc/quality.rst
+++ b/doc/quality.rst
@@ -446,7 +446,7 @@ To achieve better quality with Intel GPU H.264/AVC encoder running EncTools BRC
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v h264_qsv -preset $preset -profile:v high -async_depth 1 \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bitrate_limit 0 -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 \
@@ -455,7 +455,7 @@ To achieve better quality with Intel GPU H.264/AVC encoder running EncTools BRC
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v h264_qsv -preset $preset -profile:v high -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bitrate_limit 0 -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 \
@@ -560,7 +560,7 @@ Example command lines:
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -frames:v $numframes -c:v h264_qsv -preset $preset -profile:v high -async_depth 1 \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bitrate_limit 0 -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -low_power ${LOW_POWER:-false} -extbrc 1 -b_strategy 1 -bf 7 -refs 5 -g 256 \
@@ -568,7 +568,7 @@ Example command lines:
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -c:v h264_qsv -preset $preset -profile:v high \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bitrate_limit 0 -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -low_power ${LOW_POWER:-false} -extbrc 1 -b_strategy 1 -bf 7 -refs 5 -g 256 \
@@ -677,7 +677,7 @@ Example command lines:
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v hevc_qsv -preset $preset -profile:v main -async_depth 1
     -b:v $bitrate -maxrate $((2 * bitrate)) -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 -b_strategy 1 \
@@ -686,7 +686,7 @@ Example command lines:
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v hevc_qsv -preset $preset -profile:v main -async_depth 1
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 -b_strategy 1 \
@@ -788,7 +788,7 @@ Example command lines:
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v hevc_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -low_power ${LOW_POWER:-false} -extbrc 1 -bf 7 -refs 4 -g 256 \
@@ -796,7 +796,7 @@ Example command lines:
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v hevc_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -low_power ${LOW_POWER:-false} -extbrc 1 -bf 7 -refs 4 -g 256 \
@@ -901,7 +901,7 @@ To achieve better quality with Intel GPU AV1 encoder running EncTools BRC we rec
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v av1_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 \
@@ -910,7 +910,7 @@ To achieve better quality with Intel GPU AV1 encoder running EncTools BRC we rec
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v av1_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -low_power ${LOW_POWER:-true} -look_ahead_depth $lad -extbrc 1 \
@@ -1007,7 +1007,7 @@ Example command lines:
 
   # VBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v av1_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bufsize $((4 * bitrate)) \
     -rc_init_occupancy $((2 * bitrate)) -b_strategy 1 -bf 7 -g 256 \
@@ -1015,7 +1015,7 @@ Example command lines:
 
   # CBR (encoding from YUV with ffmpeg-qsv)
   ffmpeg -init_hw_device vaapi=va:${DEVICE:-/dev/dri/renderD128} -init_hw_device qsv=hw@va -an \
-    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate -i $inputyuv \
+    -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate -i $inputyuv \
     -frames:v $numframes -c:v av1_qsv -preset $preset -profile:v main -async_depth 1 \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((2 * bitrate)) \
     -rc_init_occupancy $bitrate -b_strategy 1 -bf 7 -g 256 \
@@ -1073,14 +1073,14 @@ ffmpeg-x264
 ::
 
   # VBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx264 -preset medium -profile:v high \
     -b:v $bitrate -bufsize $((2 * bitrate)) -maxrate $((2 * bitrate)) \
     -tune psnr -threads 12 -fps_mode passthrough $output
 
   # CBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx264 -preset medium -profile:v high \
     -b:v $bitrate -x264opts no-sliced-threads:nal-hrd=cbr \
@@ -1092,14 +1092,14 @@ ffmpeg-x265
 ::
 
   # VBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx265 -preset medium \
     -b:v $bitrate -maxrate $((2 * bitrate)) -bufsize $((2 * bitrate)) \
     -tune psnr -threads 12 -fps_mode passthrough $output
 
   # CBR (encoding from YUV)
-  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -r $framerate \
+  ffmpeg -f rawvideo -pix_fmt yuv420p -s:v ${width}x${height} -framerate $framerate \
     -i $inputyuv -vframes $numframes -y \
     -c:v libx265 -preset medium \
     -b:v $bitrate -maxrate $bitrate -minrate $bitrate -bufsize $((2 * bitrate)) \
diff --git a/measure/quality/AV1/run_cbr_ffmpeg-qsv-ld.sh b/measure/quality/AV1/run_cbr_ffmpeg-qsv-ld.sh
index 778469d..6980f02 100755
--- a/measure/quality/AV1/run_cbr_ffmpeg-qsv-ld.sh
+++ b/measure/quality/AV1/run_cbr_ffmpeg-qsv-ld.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AV1/run_cbr_ffmpeg-qsv.sh b/measure/quality/AV1/run_cbr_ffmpeg-qsv.sh
index 805509d..f4a7a51 100755
--- a/measure/quality/AV1/run_cbr_ffmpeg-qsv.sh
+++ b/measure/quality/AV1/run_cbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AV1/run_cbr_ffmpeg-ref-ld.sh b/measure/quality/AV1/run_cbr_ffmpeg-ref-ld.sh
index 3ad98c3..453ac33 100755
--- a/measure/quality/AV1/run_cbr_ffmpeg-ref-ld.sh
+++ b/measure/quality/AV1/run_cbr_ffmpeg-ref-ld.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AV1/run_cbr_ffmpeg-ref.sh b/measure/quality/AV1/run_cbr_ffmpeg-ref.sh
index 1a457e1..68dfec5 100755
--- a/measure/quality/AV1/run_cbr_ffmpeg-ref.sh
+++ b/measure/quality/AV1/run_cbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AV1/run_vbr_ffmpeg-qsv.sh b/measure/quality/AV1/run_vbr_ffmpeg-qsv.sh
index f95e6d5..2d88b47 100755
--- a/measure/quality/AV1/run_vbr_ffmpeg-qsv.sh
+++ b/measure/quality/AV1/run_vbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AV1/run_vbr_ffmpeg-ref.sh b/measure/quality/AV1/run_vbr_ffmpeg-ref.sh
index 23d8455..0a5d033 100755
--- a/measure/quality/AV1/run_vbr_ffmpeg-ref.sh
+++ b/measure/quality/AV1/run_vbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_cbr_ffmpeg-qsv-ld.sh b/measure/quality/AVC/run_cbr_ffmpeg-qsv-ld.sh
index b63e685..25abba1 100755
--- a/measure/quality/AVC/run_cbr_ffmpeg-qsv-ld.sh
+++ b/measure/quality/AVC/run_cbr_ffmpeg-qsv-ld.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_cbr_ffmpeg-qsv.sh b/measure/quality/AVC/run_cbr_ffmpeg-qsv.sh
index 8877703..698d213 100755
--- a/measure/quality/AVC/run_cbr_ffmpeg-qsv.sh
+++ b/measure/quality/AVC/run_cbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_cbr_ffmpeg-ref-ld.sh b/measure/quality/AVC/run_cbr_ffmpeg-ref-ld.sh
index 8b540f5..4c59049 100755
--- a/measure/quality/AVC/run_cbr_ffmpeg-ref-ld.sh
+++ b/measure/quality/AVC/run_cbr_ffmpeg-ref-ld.sh
@@ -36,7 +36,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_cbr_ffmpeg-ref.sh b/measure/quality/AVC/run_cbr_ffmpeg-ref.sh
index d7b0f8c..4cb37bc 100755
--- a/measure/quality/AVC/run_cbr_ffmpeg-ref.sh
+++ b/measure/quality/AVC/run_cbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_vbr_ffmpeg-qsv.sh b/measure/quality/AVC/run_vbr_ffmpeg-qsv.sh
index 8215e13..0affe3a 100755
--- a/measure/quality/AVC/run_vbr_ffmpeg-qsv.sh
+++ b/measure/quality/AVC/run_vbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/AVC/run_vbr_ffmpeg-ref.sh b/measure/quality/AVC/run_vbr_ffmpeg-ref.sh
index 23d8455..0a5d033 100755
--- a/measure/quality/AVC/run_vbr_ffmpeg-ref.sh
+++ b/measure/quality/AVC/run_vbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_cbr_ffmpeg-qsv-ld.sh b/measure/quality/HEVC/run_cbr_ffmpeg-qsv-ld.sh
index fd319b0..a212956 100755
--- a/measure/quality/HEVC/run_cbr_ffmpeg-qsv-ld.sh
+++ b/measure/quality/HEVC/run_cbr_ffmpeg-qsv-ld.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_cbr_ffmpeg-qsv.sh b/measure/quality/HEVC/run_cbr_ffmpeg-qsv.sh
index 287a721..d438405 100755
--- a/measure/quality/HEVC/run_cbr_ffmpeg-qsv.sh
+++ b/measure/quality/HEVC/run_cbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_cbr_ffmpeg-ref-ld.sh b/measure/quality/HEVC/run_cbr_ffmpeg-ref-ld.sh
index 18b7a73..d522613 100755
--- a/measure/quality/HEVC/run_cbr_ffmpeg-ref-ld.sh
+++ b/measure/quality/HEVC/run_cbr_ffmpeg-ref-ld.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_cbr_ffmpeg-ref.sh b/measure/quality/HEVC/run_cbr_ffmpeg-ref.sh
index 5f7c7e6..03c25ac 100755
--- a/measure/quality/HEVC/run_cbr_ffmpeg-ref.sh
+++ b/measure/quality/HEVC/run_cbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_vbr_ffmpeg-qsv.sh b/measure/quality/HEVC/run_vbr_ffmpeg-qsv.sh
index 4ade085..02f11e5 100755
--- a/measure/quality/HEVC/run_vbr_ffmpeg-qsv.sh
+++ b/measure/quality/HEVC/run_vbr_ffmpeg-qsv.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/HEVC/run_vbr_ffmpeg-ref.sh b/measure/quality/HEVC/run_vbr_ffmpeg-ref.sh
index fb3137c..5b91d3b 100755
--- a/measure/quality/HEVC/run_vbr_ffmpeg-ref.sh
+++ b/measure/quality/HEVC/run_vbr_ffmpeg-ref.sh
@@ -37,7 +37,7 @@ if [[ "${file##*.}" =~ (yuv|YUV) ]]; then
   shift
   format=$1
   shift
-  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -r $framerate"
+  rawvideo="-f rawvideo -pix_fmt $format -s:v ${width}x${height} -framerate $framerate"
 else
   nframes=$1
   shift
diff --git a/measure/quality/measure-quality b/measure/quality/measure-quality
index e69a124..8a0dd6e 100755
--- a/measure/quality/measure-quality
+++ b/measure/quality/measure-quality
@@ -1239,7 +1239,7 @@ if [ "$skip_metrics" = "no" ]; then
         out=${outprefix}_${b}Mbps_${rc}_${apps[i]}.$ext
         [[ ! -f $out ]] && continue
         if [ "$is_yuv" = "yes" ]; then
-          rawvideo="-f rawvideo -pix_fmt ${pix_fmt} -s:v ${width}x${height} -r $framerate"
+          rawvideo="-f rawvideo -pix_fmt ${pix_fmt} -s:v ${width}x${height} -framerate $framerate"
         fi
 
         metrics=""