diff --git a/README.md b/README.md
index 261538c..ab98097 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,15 @@ Test applications are tagged with `ffmpeg-kit` release they depend on.
 
 |  Platform | FFmpegKit Version |                                        Tag                                        |
 | :----: |:-----------------:|:---------------------------------------------------------------------------------:|
+| Android |        6.0        |       [6.0](https://github.com/arthenica/ffmpeg-kit-test/tree/android.v6.0)       |
+| Android |      6.0.LTS      |   [6.0.LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/android.v6.0.lts)   |
+| iOS |        6.0        |         [6.0](https://github.com/arthenica/ffmpeg-kit-test/tree/ios.v6.0)         |
+| iOS |      6.0.LTS      |    [6.0.LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/ios.v6.0.lts)    |
+| macOS |        6.0        |       [6.0](https://github.com/arthenica/ffmpeg-kit-test/tree/macos.v6.0)       |
+| macOS |      6.0.LTS      |   [6.0.LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/macos.v6.0.lts)   |
+| tvOS |        6.0        |       [6.0](https://github.com/arthenica/ffmpeg-kit-test/tree/tvos.v6.0)        |
+| tvOS |      6.0.LTS      |   [6.0.LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/tvos.v6.0.lts)    |
+| - |         -         |                                         -                                         |
 | Android |        5.1        |       [5.1](https://github.com/arthenica/ffmpeg-kit-test/tree/android.v5.1)       |
 | Android |      5.1.LTS      |   [5.1.LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/android.v5.1.lts)   |
 | iOS |        5.1        |         [5.1](https://github.com/arthenica/ffmpeg-kit-test/tree/ios.v5.1)         |
diff --git a/android/build.gradle b/android/build.gradle
index e76cba4..4d286df 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index ae04661..84a0b92 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/test-app-local-dependency/build.gradle b/android/test-app-local-dependency/build.gradle
index 0f89dab..01ba4dc 100644
--- a/android/test-app-local-dependency/build.gradle
+++ b/android/test-app-local-dependency/build.gradle
@@ -9,14 +9,16 @@ android {
             keyPassword 'android'
         }
     }
-    namespace 'com.arthenica.ffmpegkit.test'
-    compileSdk 31
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.arthenica.ffmpegkit.test'
+    }
+    compileSdk 33
     defaultConfig {
         applicationId "com.arthenica.ffmpegkit.test"
         minSdk 24
-        targetSdk 31
-        versionCode 240510
-        versionName "5.1"
+        targetSdk 33
+        versionCode 240600
+        versionName "6.0"
     }
     buildTypes {
         debug {
@@ -55,6 +57,6 @@ dependencies {
     // implementation files('../../../ffmpeg-kit/prebuilt/bundle-android-aar-lts/ffmpeg-kit/ffmpeg-kit.aar')
     implementation files('../../../ffmpeg-kit/prebuilt/bundle-android-aar/ffmpeg-kit/ffmpeg-kit.aar')
     implementation 'com.arthenica:smart-exception-java:0.2.1'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
diff --git a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
index 3b8fe44..e45bc1c 100644
--- a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
+++ b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
@@ -250,7 +250,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
index 96d0469..951c279 100644
--- a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
+++ b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
@@ -336,7 +336,7 @@ private void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
index 06009d9..3cf2770 100644
--- a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
+++ b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
@@ -286,7 +286,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/Video.java b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/Video.java
index fe0daf7..71f9fa6 100644
--- a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/Video.java
+++ b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/Video.java
@@ -49,7 +49,7 @@ static String generateCreateVideoWithPipesScript(final String image1Pipe, final
                         "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
                         "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
                         "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-                        " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
     }
 
     static String generateEncodeVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath, final String videoCodec, final String customOptions) {
@@ -74,7 +74,7 @@ static String generateEncodeVideoScript(final String image1Path, final String im
                         "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
                         "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
                         "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=" + pixelFormat + "[video]\"" +
-                        " -map [video] -vsync 2 -async 1 " + customOptions + "-c:v " + videoCodec.toLowerCase(Locale.ENGLISH) + " -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr " + customOptions + "-c:v " + videoCodec.toLowerCase(Locale.ENGLISH) + " -r 30 " + videoFilePath;
     }
 
     static String generateShakingVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath) {
@@ -94,7 +94,7 @@ static String generateShakingVideoScript(final String image1Path, final String i
                         "[3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];" +
                         "[3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];" +
                         "[stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-                        " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
     }
 
     static String generateZscaleVideoScript(final String inputVideoFilePath, final String outputVideoFilePath) {
diff --git a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
index 53a0e68..5951010 100644
--- a/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
+++ b/android/test-app-local-dependency/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
@@ -243,6 +243,12 @@ public String getSelectedVideoCodec() {
             case "x264":
                 videoCodec = "libx264";
                 break;
+            case "h264_mediacodec":
+                videoCodec = "h264_mediacodec";
+                break;
+            case "hevc_mediacodec":
+                videoCodec = "hevc_mediacodec";
+                break;
             case "openh264":
                 videoCodec = "libopenh264";
                 break;
@@ -292,7 +298,7 @@ public File getVideoFile() {
                 break;
             default:
 
-                // mpeg4, x264, x265, xvid, kvazaar
+                // mpeg4, x264, h264_mediacodec, hevc_mediacodec, x265, xvid, kvazaar
                 extension = "mp4";
                 break;
         }
@@ -319,7 +325,7 @@ public String getCustomOptions() {
                 return "-format hap_q ";
             default:
 
-                // kvazaar, mpeg4, x264, xvid
+                // kvazaar, mpeg4, x264, h264_mediacodec, hevc_mediacodec, xvid
                 return "";
         }
     }
@@ -344,7 +350,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-local-dependency/src/main/res/values/video_codec.xml b/android/test-app-local-dependency/src/main/res/values/video_codec.xml
index 9f2eb89..4f0af49 100644
--- a/android/test-app-local-dependency/src/main/res/values/video_codec.xml
+++ b/android/test-app-local-dependency/src/main/res/values/video_codec.xml
@@ -3,6 +3,8 @@
     <string-array name="video_codec">
         <item>mpeg4</item>
         <item>x264</item>
+        <item>h264_mediacodec</item>
+        <item>hevc_mediacodec</item>
         <item>openh264</item>
         <item>x265</item>
         <item>xvid</item>
diff --git a/android/test-app-maven-central/build.gradle b/android/test-app-maven-central/build.gradle
index 9e24103..252a9ae 100644
--- a/android/test-app-maven-central/build.gradle
+++ b/android/test-app-maven-central/build.gradle
@@ -9,14 +9,16 @@ android {
             keyPassword 'android'
         }
     }
-    namespace 'com.arthenica.ffmpegkit.test'
-    compileSdk 31
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.arthenica.ffmpegkit.test'
+    }
+    compileSdk 33
     defaultConfig {
         applicationId "com.arthenica.ffmpegkit.test"
         minSdk 24
-        targetSdk 31
-        versionCode 240510
-        versionName "5.1"
+        targetSdk 33
+        versionCode 240600
+        versionName "6.0"
     }
     buildTypes {
         debug {
@@ -52,7 +54,7 @@ android.applicationVariants.all { variant ->
 }
 
 dependencies {
-    implementation 'com.arthenica:ffmpeg-kit-full:5.1'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.arthenica:ffmpeg-kit-full:6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
diff --git a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
index 3b8fe44..e45bc1c 100644
--- a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
+++ b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/PipeTabFragment.java
@@ -250,7 +250,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
index 96d0469..951c279 100644
--- a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
+++ b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SafTabFragment.java
@@ -336,7 +336,7 @@ private void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
index 06009d9..3cf2770 100644
--- a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
+++ b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/SubtitleTabFragment.java
@@ -286,7 +286,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/Video.java b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/Video.java
index fe0daf7..71f9fa6 100644
--- a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/Video.java
+++ b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/Video.java
@@ -49,7 +49,7 @@ static String generateCreateVideoWithPipesScript(final String image1Pipe, final
                         "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
                         "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
                         "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-                        " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
     }
 
     static String generateEncodeVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath, final String videoCodec, final String customOptions) {
@@ -74,7 +74,7 @@ static String generateEncodeVideoScript(final String image1Path, final String im
                         "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
                         "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
                         "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=" + pixelFormat + "[video]\"" +
-                        " -map [video] -vsync 2 -async 1 " + customOptions + "-c:v " + videoCodec.toLowerCase(Locale.ENGLISH) + " -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr " + customOptions + "-c:v " + videoCodec.toLowerCase(Locale.ENGLISH) + " -r 30 " + videoFilePath;
     }
 
     static String generateShakingVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath) {
@@ -94,7 +94,7 @@ static String generateShakingVideoScript(final String image1Path, final String i
                         "[3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];" +
                         "[3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];" +
                         "[stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-                        " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+                        " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
     }
 
     static String generateZscaleVideoScript(final String inputVideoFilePath, final String outputVideoFilePath) {
diff --git a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
index 53a0e68..5951010 100644
--- a/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
+++ b/android/test-app-maven-central/src/main/java/com/arthenica/ffmpegkit/test/VideoTabFragment.java
@@ -243,6 +243,12 @@ public String getSelectedVideoCodec() {
             case "x264":
                 videoCodec = "libx264";
                 break;
+            case "h264_mediacodec":
+                videoCodec = "h264_mediacodec";
+                break;
+            case "hevc_mediacodec":
+                videoCodec = "hevc_mediacodec";
+                break;
             case "openh264":
                 videoCodec = "libopenh264";
                 break;
@@ -292,7 +298,7 @@ public File getVideoFile() {
                 break;
             default:
 
-                // mpeg4, x264, x265, xvid, kvazaar
+                // mpeg4, x264, h264_mediacodec, hevc_mediacodec, x265, xvid, kvazaar
                 extension = "mp4";
                 break;
         }
@@ -319,7 +325,7 @@ public String getCustomOptions() {
                 return "-format hap_q ";
             default:
 
-                // kvazaar, mpeg4, x264, xvid
+                // kvazaar, mpeg4, x264, h264_mediacodec, hevc_mediacodec, xvid
                 return "";
         }
     }
@@ -344,7 +350,7 @@ protected void updateProgressDialog() {
             return;
         }
 
-        int timeInMilliseconds = this.statistics.getTime();
+        double timeInMilliseconds = this.statistics.getTime();
         int totalVideoDuration = 9000;
 
         String completePercentage = new BigDecimal(timeInMilliseconds).multiply(new BigDecimal(100)).divide(new BigDecimal(totalVideoDuration), 0, BigDecimal.ROUND_HALF_UP).toString();
diff --git a/android/test-app-maven-central/src/main/res/values/video_codec.xml b/android/test-app-maven-central/src/main/res/values/video_codec.xml
index 9f2eb89..4f0af49 100644
--- a/android/test-app-maven-central/src/main/res/values/video_codec.xml
+++ b/android/test-app-maven-central/src/main/res/values/video_codec.xml
@@ -3,6 +3,8 @@
     <string-array name="video_codec">
         <item>mpeg4</item>
         <item>x264</item>
+        <item>h264_mediacodec</item>
+        <item>hevc_mediacodec</item>
         <item>openh264</item>
         <item>x265</item>
         <item>xvid</item>
diff --git a/ios/test-app-cocoapods/FFmpegKitIOS/FFmpegKitTest.m b/ios/test-app-cocoapods/FFmpegKitIOS/FFmpegKitTest.m
index af68d67..08cfc20 100644
--- a/ios/test-app-cocoapods/FFmpegKitIOS/FFmpegKitTest.m
+++ b/ios/test-app-cocoapods/FFmpegKitIOS/FFmpegKitTest.m
@@ -77,10 +77,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -91,11 +91,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/ios/test-app-cocoapods/FFmpegKitIOS/PipeViewController.m b/ios/test-app-cocoapods/FFmpegKitIOS/PipeViewController.m
index ec28239..64a7fc4 100644
--- a/ios/test-app-cocoapods/FFmpegKitIOS/PipeViewController.m
+++ b/ios/test-app-cocoapods/FFmpegKitIOS/PipeViewController.m
@@ -263,7 +263,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/ios/test-app-cocoapods/FFmpegKitIOS/SubtitleViewController.m b/ios/test-app-cocoapods/FFmpegKitIOS/SubtitleViewController.m
index 4b9c30e..09ecb4c 100644
--- a/ios/test-app-cocoapods/FFmpegKitIOS/SubtitleViewController.m
+++ b/ios/test-app-cocoapods/FFmpegKitIOS/SubtitleViewController.m
@@ -259,7 +259,7 @@ - (void)updateProgressDialog {
     }
     
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/ios/test-app-cocoapods/FFmpegKitIOS/Video.m b/ios/test-app-cocoapods/FFmpegKitIOS/Video.m
index f910e28..f6bbfba 100644
--- a/ios/test-app-cocoapods/FFmpegKitIOS/Video.m
+++ b/ios/test-app-cocoapods/FFmpegKitIOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/ios/test-app-cocoapods/FFmpegKitIOS/VideoViewController.m b/ios/test-app-cocoapods/FFmpegKitIOS/VideoViewController.m
index f5d8993..c0adccf 100644
--- a/ios/test-app-cocoapods/FFmpegKitIOS/VideoViewController.m
+++ b/ios/test-app-cocoapods/FFmpegKitIOS/VideoViewController.m
@@ -314,7 +314,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/ios/test-app-cocoapods/Podfile b/ios/test-app-cocoapods/Podfile
index d8143de..cb55a07 100644
--- a/ios/test-app-cocoapods/Podfile
+++ b/ios/test-app-cocoapods/Podfile
@@ -3,5 +3,5 @@ platform :ios, '12.1'
 use_frameworks!
 
 target "FFmpegKitIOS" do
-    pod 'ffmpeg-kit-ios-full', '5.1'
+    pod 'ffmpeg-kit-ios-full', '6.0'
 end
diff --git a/ios/test-app-cocoapods/Podfile.lock b/ios/test-app-cocoapods/Podfile.lock
index 9bd3a47..9b3d050 100644
--- a/ios/test-app-cocoapods/Podfile.lock
+++ b/ios/test-app-cocoapods/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - ffmpeg-kit-ios-full (5.1)
+  - ffmpeg-kit-ios-full (6.0)
 
 DEPENDENCIES:
-  - ffmpeg-kit-ios-full (= 5.1)
+  - ffmpeg-kit-ios-full (= 6.0)
 
 SPEC REPOS:
   trunk:
     - ffmpeg-kit-ios-full
 
 SPEC CHECKSUMS:
-  ffmpeg-kit-ios-full: 4a02624db22a9ea1e92e3b6707bffe67c76f4aad
+  ffmpeg-kit-ios-full: 0099a769d22114dde52cdc238397941c32f75d27
 
-PODFILE CHECKSUM: d33ad1ed4542f47af092078dbea2f23d511b1388
+PODFILE CHECKSUM: 8c42a302da6ad905c148995a942a9ec84a405dfd
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/ios/test-app-local-dependency/FFmpegKitIOS/FFmpegKitTest.m b/ios/test-app-local-dependency/FFmpegKitIOS/FFmpegKitTest.m
index af68d67..08cfc20 100644
--- a/ios/test-app-local-dependency/FFmpegKitIOS/FFmpegKitTest.m
+++ b/ios/test-app-local-dependency/FFmpegKitIOS/FFmpegKitTest.m
@@ -77,10 +77,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -91,11 +91,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/ios/test-app-local-dependency/FFmpegKitIOS/PipeViewController.m b/ios/test-app-local-dependency/FFmpegKitIOS/PipeViewController.m
index ec28239..64a7fc4 100644
--- a/ios/test-app-local-dependency/FFmpegKitIOS/PipeViewController.m
+++ b/ios/test-app-local-dependency/FFmpegKitIOS/PipeViewController.m
@@ -263,7 +263,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/ios/test-app-local-dependency/FFmpegKitIOS/SubtitleViewController.m b/ios/test-app-local-dependency/FFmpegKitIOS/SubtitleViewController.m
index 4b9c30e..09ecb4c 100644
--- a/ios/test-app-local-dependency/FFmpegKitIOS/SubtitleViewController.m
+++ b/ios/test-app-local-dependency/FFmpegKitIOS/SubtitleViewController.m
@@ -259,7 +259,7 @@ - (void)updateProgressDialog {
     }
     
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/ios/test-app-local-dependency/FFmpegKitIOS/Video.m b/ios/test-app-local-dependency/FFmpegKitIOS/Video.m
index f910e28..f6bbfba 100644
--- a/ios/test-app-local-dependency/FFmpegKitIOS/Video.m
+++ b/ios/test-app-local-dependency/FFmpegKitIOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/ios/test-app-local-dependency/FFmpegKitIOS/VideoViewController.m b/ios/test-app-local-dependency/FFmpegKitIOS/VideoViewController.m
index f5d8993..c0adccf 100644
--- a/ios/test-app-local-dependency/FFmpegKitIOS/VideoViewController.m
+++ b/ios/test-app-local-dependency/FFmpegKitIOS/VideoViewController.m
@@ -314,7 +314,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/linux/test-app-local-dependency/CMakeLists.txt b/linux/test-app-local-dependency/CMakeLists.txt
index 23fcc13..43fbd42 100644
--- a/linux/test-app-local-dependency/CMakeLists.txt
+++ b/linux/test-app-local-dependency/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.7)
-project(ffmpeg-kit-linux-test VERSION 5.1)
+project(ffmpeg-kit-linux-test VERSION 6.0)
 
 include(CTest)
 enable_testing()
 
 set(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/../../../ffmpeg-kit/prebuilt/bundle-linux/ffmpeg-kit/pkgconfig")
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(FFMPEG_KIT REQUIRED IMPORTED_TARGET ffmpeg-kit=5.1)
+pkg_check_modules(FFMPEG_KIT REQUIRED IMPORTED_TARGET ffmpeg-kit=6.0)
 pkg_check_modules(GTKMM REQUIRED IMPORTED_TARGET gtkmm-3.0>=3.0)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ffmpeg-kit-linux-test-app.sh.in ${CMAKE_CURRENT_BINARY_DIR}/bin/ffmpeg-kit-linux-test-app.sh @ONLY)
diff --git a/linux/test-app-local-dependency/src/FFmpegKitTest.cpp b/linux/test-app-local-dependency/src/FFmpegKitTest.cpp
index 1675abb..12722fe 100644
--- a/linux/test-app-local-dependency/src/FFmpegKitTest.cpp
+++ b/linux/test-app-local-dependency/src/FFmpegKitTest.cpp
@@ -28,9 +28,9 @@
 using namespace ffmpegkit;
 
 void testParseSimpleCommand() {
-    auto argumentList = FFmpegKitConfig::parseArguments("-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    auto argumentList = FFmpegKitConfig::parseArguments("-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
-    assert(14 == argumentList.size());
+    assert(12 == argumentList.size());
 
     auto it = argumentList.begin();
     assertString("-hide_banner", *it++);
@@ -42,10 +42,8 @@ void testParseSimpleCommand() {
     assertString("[0:v]setpts=PTS-STARTPTS[video]", *it++);
     assertString("-map", *it++);
     assertString("[video]", *it++);
-    assertString("-vsync", *it++);
-    assertString("2", *it++);
-    assertString("-async", *it++);
-    assertString("1", *it++);
+    assertString("-fps_mode", *it++);
+    assertString("cfr", *it++);
     assertString("video.mp4", *it++);
 }
 
diff --git a/linux/test-app-local-dependency/src/PipeTab.cpp b/linux/test-app-local-dependency/src/PipeTab.cpp
index 13d3854..8dfbfbe 100644
--- a/linux/test-app-local-dependency/src/PipeTab.cpp
+++ b/linux/test-app-local-dependency/src/PipeTab.cpp
@@ -109,7 +109,7 @@ void ffmpegkittest::PipeTab::updateProgressDialog(const std::shared_ptr<ffmpegki
     }
 
     this->statistics = statistics;
-    int timeInMilliseconds = this->statistics->getTime();
+    double timeInMilliseconds = this->statistics->getTime();
     int totalVideoDuration = 9000;
     double completePercentage = timeInMilliseconds*100/totalVideoDuration;
     // progressDialog.update(completePercentage);
diff --git a/linux/test-app-local-dependency/src/SubtitleTab.cpp b/linux/test-app-local-dependency/src/SubtitleTab.cpp
index 03b36ae..a3f67ec 100644
--- a/linux/test-app-local-dependency/src/SubtitleTab.cpp
+++ b/linux/test-app-local-dependency/src/SubtitleTab.cpp
@@ -124,7 +124,7 @@ void ffmpegkittest::SubtitleTab::updateProgressDialog(const std::shared_ptr<ffmp
     }
 
     this->statistics = statistics;
-    int timeInMilliseconds = this->statistics->getTime();
+    double timeInMilliseconds = this->statistics->getTime();
     int totalVideoDuration = 9000;
     double completePercentage = timeInMilliseconds*100/totalVideoDuration;
     // progressDialog.update(completePercentage);
diff --git a/linux/test-app-local-dependency/src/Video.cpp b/linux/test-app-local-dependency/src/Video.cpp
index efb2a34..82a10d9 100644
--- a/linux/test-app-local-dependency/src/Video.cpp
+++ b/linux/test-app-local-dependency/src/Video.cpp
@@ -40,7 +40,7 @@ std::string ffmpegkittest::Video::generateCreateVideoWithPipesScript(std::string
             "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
             "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
             "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-            " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+            " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
 }
 
 std::string ffmpegkittest::Video::generateEncodeVideoScript(std::string image1Path, std::string image2Path, std::string image3Path, std::string videoFilePath, std::string videoCodec, std::string customOptions) {
@@ -65,7 +65,7 @@ std::string ffmpegkittest::Video::generateEncodeVideoScript(std::string image1Pa
             "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];" +
             "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];" +
             "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=" + pixelFormat + "[video]\"" +
-            " -map [video] -vsync 2 -async 1 " + customOptions + "-c:v " + videoCodec + " -r 30 " + videoFilePath;
+            " -map [video] -fps_mode cfr " + customOptions + "-c:v " + videoCodec + " -r 30 " + videoFilePath;
 }
 
 std::string ffmpegkittest::Video::generateShakingVideoScript(std::string image1Path, std::string image2Path, std::string image3Path, std::string videoFilePath) {
@@ -85,7 +85,7 @@ std::string ffmpegkittest::Video::generateShakingVideoScript(std::string image1P
             "[3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];" +
             "[3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];" +
             "[stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\"" +
-            " -map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 " + videoFilePath;
+            " -map [video] -fps_mode cfr -c:v mpeg4 -r 30 " + videoFilePath;
 }
 
 std::string ffmpegkittest::Video::generateZscaleVideoScript(std::string inputVideoFilePath, std::string outputVideoFilePath) {
diff --git a/linux/test-app-local-dependency/src/VideoTab.cpp b/linux/test-app-local-dependency/src/VideoTab.cpp
index bc238ea..7286f6b 100644
--- a/linux/test-app-local-dependency/src/VideoTab.cpp
+++ b/linux/test-app-local-dependency/src/VideoTab.cpp
@@ -101,7 +101,7 @@ void ffmpegkittest::VideoTab::updateProgressDialog(const std::shared_ptr<ffmpegk
     }
 
     this->statistics = statistics;
-    int timeInMilliseconds = this->statistics->getTime();
+    double timeInMilliseconds = this->statistics->getTime();
     int totalVideoDuration = 9000;
     double completePercentage = timeInMilliseconds*100/totalVideoDuration;
     // progressDialog.update(completePercentage);
diff --git a/linux/test-app-local-dependency/src/main.cpp b/linux/test-app-local-dependency/src/main.cpp
index a02f5c7..bedca8b 100644
--- a/linux/test-app-local-dependency/src/main.cpp
+++ b/linux/test-app-local-dependency/src/main.cpp
@@ -24,6 +24,7 @@
 #include "MediaInformationParserTest.h"
 #include "FFmpegKitTest.h"
 #include <FFmpegKitConfig.h>
+#include <locale.h>
 
 int main(int argc, char** argv) {
     auto app = Gtk::Application::create(argc, argv, "com.arthenica.ffmpegkit");
@@ -31,6 +32,9 @@ int main(int argc, char** argv) {
     application.set_default_icon_name("ffmpeg-kit-linux-test");
     application.set_icon_name("ffmpeg-kit-linux-test");
 
+    // FIX DEFAULT LOCALE AFTER GTK INIT
+    setlocale(LC_ALL, "C");
+
     // RUN UNIT TESTS BEFORE STARTING THE APPLICATION
     testMediaInformationJsonParser();
     testFFmpegKit();
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS.xcworkspace/xcuserdata/sue.xcuserdatad/UserInterfaceState.xcuserstate b/macos/test-app-cocoapods/FFmpegKitMACOS.xcworkspace/xcuserdata/sue.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..098f2dd
Binary files /dev/null and b/macos/test-app-cocoapods/FFmpegKitMACOS.xcworkspace/xcuserdata/sue.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS/FFmpegKitTest.m b/macos/test-app-cocoapods/FFmpegKitMACOS/FFmpegKitTest.m
index db15dd8..33f57dc 100644
--- a/macos/test-app-cocoapods/FFmpegKitMACOS/FFmpegKitTest.m
+++ b/macos/test-app-cocoapods/FFmpegKitMACOS/FFmpegKitTest.m
@@ -78,10 +78,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -92,11 +92,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS/PipeViewController.m b/macos/test-app-cocoapods/FFmpegKitMACOS/PipeViewController.m
index 720675e..bd5e6d0 100644
--- a/macos/test-app-cocoapods/FFmpegKitMACOS/PipeViewController.m
+++ b/macos/test-app-cocoapods/FFmpegKitMACOS/PipeViewController.m
@@ -233,7 +233,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS/SubtitleViewController.m b/macos/test-app-cocoapods/FFmpegKitMACOS/SubtitleViewController.m
index fef6032..7790207 100644
--- a/macos/test-app-cocoapods/FFmpegKitMACOS/SubtitleViewController.m
+++ b/macos/test-app-cocoapods/FFmpegKitMACOS/SubtitleViewController.m
@@ -218,7 +218,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS/Video.m b/macos/test-app-cocoapods/FFmpegKitMACOS/Video.m
index f910e28..f6bbfba 100644
--- a/macos/test-app-cocoapods/FFmpegKitMACOS/Video.m
+++ b/macos/test-app-cocoapods/FFmpegKitMACOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/macos/test-app-cocoapods/FFmpegKitMACOS/VideoViewController.m b/macos/test-app-cocoapods/FFmpegKitMACOS/VideoViewController.m
index d86d51a..3b97ba6 100644
--- a/macos/test-app-cocoapods/FFmpegKitMACOS/VideoViewController.m
+++ b/macos/test-app-cocoapods/FFmpegKitMACOS/VideoViewController.m
@@ -285,7 +285,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/macos/test-app-cocoapods/Podfile b/macos/test-app-cocoapods/Podfile
index 726ce29..a56067e 100644
--- a/macos/test-app-cocoapods/Podfile
+++ b/macos/test-app-cocoapods/Podfile
@@ -3,5 +3,5 @@ platform :osx, '10.15'
 use_frameworks!
 
 target "FFmpegKitMACOS" do
-    pod 'ffmpeg-kit-macos-full', '5.1'
+    pod 'ffmpeg-kit-macos-full', '6.0'
 end
diff --git a/macos/test-app-cocoapods/Podfile.lock b/macos/test-app-cocoapods/Podfile.lock
index b235716..8bf6093 100644
--- a/macos/test-app-cocoapods/Podfile.lock
+++ b/macos/test-app-cocoapods/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - ffmpeg-kit-macos-full (5.1)
+  - ffmpeg-kit-macos-full (6.0)
 
 DEPENDENCIES:
-  - ffmpeg-kit-macos-full (= 5.1)
+  - ffmpeg-kit-macos-full (= 6.0)
 
 SPEC REPOS:
   trunk:
     - ffmpeg-kit-macos-full
 
 SPEC CHECKSUMS:
-  ffmpeg-kit-macos-full: c292021070be5472e9c855bd59bd44fa75352c84
+  ffmpeg-kit-macos-full: 89a5665b57ebbbb7e93f0e82417729f5387326e5
 
-PODFILE CHECKSUM: 8e96a72264bd9abe608123afbbde893bc39b2ebc
+PODFILE CHECKSUM: 59d57da72381086688a04a0587dd37a174a78d70
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/macos/test-app-local-dependency/FFmpegKitMACOS/FFmpegKitTest.m b/macos/test-app-local-dependency/FFmpegKitMACOS/FFmpegKitTest.m
index db15dd8..33f57dc 100644
--- a/macos/test-app-local-dependency/FFmpegKitMACOS/FFmpegKitTest.m
+++ b/macos/test-app-local-dependency/FFmpegKitMACOS/FFmpegKitTest.m
@@ -78,10 +78,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -92,11 +92,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/macos/test-app-local-dependency/FFmpegKitMACOS/PipeViewController.m b/macos/test-app-local-dependency/FFmpegKitMACOS/PipeViewController.m
index 720675e..bd5e6d0 100644
--- a/macos/test-app-local-dependency/FFmpegKitMACOS/PipeViewController.m
+++ b/macos/test-app-local-dependency/FFmpegKitMACOS/PipeViewController.m
@@ -233,7 +233,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/macos/test-app-local-dependency/FFmpegKitMACOS/SubtitleViewController.m b/macos/test-app-local-dependency/FFmpegKitMACOS/SubtitleViewController.m
index fef6032..7790207 100644
--- a/macos/test-app-local-dependency/FFmpegKitMACOS/SubtitleViewController.m
+++ b/macos/test-app-local-dependency/FFmpegKitMACOS/SubtitleViewController.m
@@ -218,7 +218,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/macos/test-app-local-dependency/FFmpegKitMACOS/Video.m b/macos/test-app-local-dependency/FFmpegKitMACOS/Video.m
index f910e28..f6bbfba 100644
--- a/macos/test-app-local-dependency/FFmpegKitMACOS/Video.m
+++ b/macos/test-app-local-dependency/FFmpegKitMACOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/macos/test-app-local-dependency/FFmpegKitMACOS/VideoViewController.m b/macos/test-app-local-dependency/FFmpegKitMACOS/VideoViewController.m
index d86d51a..3b97ba6 100644
--- a/macos/test-app-local-dependency/FFmpegKitMACOS/VideoViewController.m
+++ b/macos/test-app-local-dependency/FFmpegKitMACOS/VideoViewController.m
@@ -285,7 +285,7 @@ - (void)updateProgressDialog {
         return;
     }
 
-    int timeInMilliseconds = [statistics getTime];
+    double timeInMilliseconds = [statistics getTime];
     int totalVideoDuration = 9000;
 
     int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-cocoapods/FFmpegKitTVOS/FFmpegKitTest.m b/tvos/test-app-cocoapods/FFmpegKitTVOS/FFmpegKitTest.m
index af68d67..08cfc20 100644
--- a/tvos/test-app-cocoapods/FFmpegKitTVOS/FFmpegKitTest.m
+++ b/tvos/test-app-cocoapods/FFmpegKitTVOS/FFmpegKitTest.m
@@ -77,10 +77,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -91,11 +91,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/tvos/test-app-cocoapods/FFmpegKitTVOS/PipeViewController.m b/tvos/test-app-cocoapods/FFmpegKitTVOS/PipeViewController.m
index 3862b12..90e4c19 100644
--- a/tvos/test-app-cocoapods/FFmpegKitTVOS/PipeViewController.m
+++ b/tvos/test-app-cocoapods/FFmpegKitTVOS/PipeViewController.m
@@ -265,7 +265,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-cocoapods/FFmpegKitTVOS/SubtitleViewController.m b/tvos/test-app-cocoapods/FFmpegKitTVOS/SubtitleViewController.m
index a757a14..40e9120 100644
--- a/tvos/test-app-cocoapods/FFmpegKitTVOS/SubtitleViewController.m
+++ b/tvos/test-app-cocoapods/FFmpegKitTVOS/SubtitleViewController.m
@@ -259,7 +259,7 @@ - (void)updateProgressDialog {
     }
     
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-cocoapods/FFmpegKitTVOS/Video.m b/tvos/test-app-cocoapods/FFmpegKitTVOS/Video.m
index f910e28..f6bbfba 100644
--- a/tvos/test-app-cocoapods/FFmpegKitTVOS/Video.m
+++ b/tvos/test-app-cocoapods/FFmpegKitTVOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/tvos/test-app-cocoapods/FFmpegKitTVOS/VideoViewController.m b/tvos/test-app-cocoapods/FFmpegKitTVOS/VideoViewController.m
index 9ba95aa..7e729c6 100644
--- a/tvos/test-app-cocoapods/FFmpegKitTVOS/VideoViewController.m
+++ b/tvos/test-app-cocoapods/FFmpegKitTVOS/VideoViewController.m
@@ -283,7 +283,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-cocoapods/Podfile b/tvos/test-app-cocoapods/Podfile
index f02871c..e865408 100644
--- a/tvos/test-app-cocoapods/Podfile
+++ b/tvos/test-app-cocoapods/Podfile
@@ -3,5 +3,5 @@ platform :tvos, '11.0'
 use_frameworks!
 
 target "FFmpegKitTVOS" do
-    pod 'ffmpeg-kit-tvos-full', '5.1'
+    pod 'ffmpeg-kit-tvos-full', '6.0'
 end
diff --git a/tvos/test-app-cocoapods/Podfile.lock b/tvos/test-app-cocoapods/Podfile.lock
index 373776b..e2e1355 100644
--- a/tvos/test-app-cocoapods/Podfile.lock
+++ b/tvos/test-app-cocoapods/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - ffmpeg-kit-tvos-full (5.1)
+  - ffmpeg-kit-tvos-full (6.0)
 
 DEPENDENCIES:
-  - ffmpeg-kit-tvos-full (= 5.1)
+  - ffmpeg-kit-tvos-full (= 6.0)
 
 SPEC REPOS:
   trunk:
     - ffmpeg-kit-tvos-full
 
 SPEC CHECKSUMS:
-  ffmpeg-kit-tvos-full: f98fd71a863bd7278bdbd57a8215fa2871c53c82
+  ffmpeg-kit-tvos-full: 3e42e7827a17f9f09f349c893b145cf7bd369723
 
-PODFILE CHECKSUM: f6debb332e46b18eac87c8576514513247ab7f80
+PODFILE CHECKSUM: f5e3d829219dfdd2918947cf23be623769b07f37
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/Base.lproj/Main.storyboard b/tvos/test-app-local-dependency/FFmpegKitTVOS/Base.lproj/Main.storyboard
index 137dcc9..4d0deb0 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/Base.lproj/Main.storyboard
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="19529" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="B80-EI-IC6">
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="21701" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="B80-EI-IC6">
     <device id="appleTV" appearance="light"/>
     <dependencies>
         <deployment identifier="tvOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +21,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Wr-qB-Pyg" userLabel="Run FFmpeg Button" customClass="TvButton">
-                                <rect key="frame" x="895" y="202" width="130" height="32"/>
+                                <rect key="frame" x="895" y="299" width="130" height="32"/>
                                 <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.95983767649706664" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="Vbs-En-ncY"/>
@@ -41,7 +41,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0OP-Pr-kwN" userLabel="Run FFprobe Button" customClass="TvButton">
-                                <rect key="frame" x="895" y="264" width="130" height="32"/>
+                                <rect key="frame" x="895" y="361" width="130" height="32"/>
                                 <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.96078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="130" id="85g-G9-Rc6"/>
@@ -63,7 +63,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4qP-Cg-LeP">
-                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274509803915" green="0.40784313725490196" blue="0.25882352941176467" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="e4q-j1-NcS"/>
@@ -73,7 +73,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter command" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WEh-8G-EBV">
-                                <rect key="frame" x="100" y="140" width="1720" height="32"/>
+                                <rect key="frame" x="100" y="237" width="1720" height="32"/>
                                 <color key="backgroundColor" red="0.90198421478271484" green="0.9058806300163269" blue="0.91761696338653564" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="0at-Ak-O3K"/>
@@ -82,7 +82,7 @@
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                             </textField>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="gqc-19-yb3">
-                                <rect key="frame" x="110" y="326" width="1700" height="654"/>
+                                <rect key="frame" x="110" y="423" width="1700" height="557"/>
                                 <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="Run output"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -165,7 +165,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QbR-eE-pgH">
-                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="Gb0-Bm-JS3"/>
@@ -175,7 +175,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NbH-jU-Bnw">
-                                <rect key="frame" x="100" y="227" width="1720" height="327"/>
+                                <rect key="frame" x="100" y="130" width="1720" height="424"/>
                                 <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -229,7 +229,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FZM-Vr-bIG">
-                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="T0c-do-Xxb"/>
@@ -239,7 +239,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MFI-fh-ESA" customClass="TvButton">
-                                <rect key="frame" x="880" y="170" width="160" height="32"/>
+                                <rect key="frame" x="880" y="267" width="160" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="C4k-M7-qc6"/>
@@ -260,7 +260,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHy-Oy-kEf">
-                                <rect key="frame" x="100" y="262" width="1720" height="698"/>
+                                <rect key="frame" x="100" y="359" width="1720" height="601"/>
                                 <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -307,7 +307,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qjq-ds-G4r">
-                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="xbI-E1-tqj"/>
@@ -317,7 +317,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z7Q-Af-rbI" customClass="TvButton">
-                                <rect key="frame" x="920" y="359" width="80" height="32"/>
+                                <rect key="frame" x="920" y="262" width="80" height="32"/>
                                 <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="6F7-uT-WDk"/>
@@ -338,14 +338,14 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wZ4-t0-3Pz">
-                                <rect key="frame" x="20" y="421" width="1880" height="579"/>
+                                <rect key="frame" x="20" y="324" width="1880" height="676"/>
                                 <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="mpeg4" borderStyle="roundedRect" placeholder="mpeg4, h264 (x264), h264 (openh264), h264 (videotoolbox), x265, xvid, vp8, vp9, aom, kvazaar, theora, hap" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ATw-Py-5o6" userLabel="Video Codec Text">
-                                <rect key="frame" x="586" y="267" width="748" height="32"/>
+                                <rect key="frame" x="586" y="170" width="748" height="32"/>
                                 <color key="backgroundColor" red="0.90198421480000002" green="0.90588062999999996" blue="0.91761696339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="400" id="ES2-Xg-2lJ"/>
@@ -399,7 +399,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pPR-jx-Kgn">
-                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="dVU-N3-oss"/>
@@ -409,7 +409,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter https url" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="pNU-kW-9m1">
-                                <rect key="frame" x="100" y="237" width="1720" height="32"/>
+                                <rect key="frame" x="100" y="140" width="1720" height="32"/>
                                 <color key="backgroundColor" red="0.90198421480000002" green="0.90588062999999996" blue="0.91761696339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="Zwb-w5-eR1"/>
@@ -418,7 +418,7 @@
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="73w-Ym-bzB" userLabel="GET INFO FROM URL" customClass="TvButton">
-                                <rect key="frame" x="555" y="309" width="170" height="32"/>
+                                <rect key="frame" x="555" y="212" width="170" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="KPq-Io-Ub5"/>
@@ -435,7 +435,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ttx-0f-Ur8" userLabel="GET RANDOM INFO" customClass="TvButton">
-                                <rect key="frame" x="765" y="309" width="170" height="32"/>
+                                <rect key="frame" x="765" y="212" width="170" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="170" id="RpM-JI-4XD"/>
@@ -452,7 +452,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dY0-L6-HW9" userLabel="GET RANDOM INFO" customClass="TvButton">
-                                <rect key="frame" x="975" y="309" width="170" height="32"/>
+                                <rect key="frame" x="975" y="212" width="170" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="170" id="SVd-PK-YiD"/>
@@ -469,7 +469,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k82-Ee-Hst" userLabel="GET INFO AND FAIL" customClass="TvButton">
-                                <rect key="frame" x="1185" y="309" width="170" height="32"/>
+                                <rect key="frame" x="1185" y="212" width="170" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="Qb9-J2-8pF"/>
@@ -486,7 +486,7 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="C7u-PF-s8v">
-                                <rect key="frame" x="100" y="391" width="1720" height="609"/>
+                                <rect key="frame" x="100" y="294" width="1720" height="706"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="Run output"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -549,7 +549,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iJH-qM-MdU">
-                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="bGj-25-Zzd"/>
@@ -559,7 +559,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3bv-dS-fDm" customClass="TvButton">
-                                <rect key="frame" x="920" y="182" width="80" height="32"/>
+                                <rect key="frame" x="920" y="279" width="80" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="Qxu-l2-Uq9"/>
@@ -580,14 +580,14 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="FNe-kj-LF2">
-                                <rect key="frame" x="100" y="244" width="1720" height="756"/>
+                                <rect key="frame" x="100" y="341" width="1720" height="659"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="Run output"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                             </textView>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="aac" borderStyle="roundedRect" placeholder="aac, mp2, mp3, vorbis, opus, amr-nb, amr-wb, ilbc, soxr, speex, wavpack" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2HS-ir-3UC" userLabel="Audio Codec Text">
-                                <rect key="frame" x="860" y="130" width="200" height="32"/>
+                                <rect key="frame" x="860" y="227" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.90198421480000002" green="0.90588062999999996" blue="0.91761696339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="200" id="Ofa-ZI-EAZ"/>
@@ -711,17 +711,17 @@
         <scene sceneID="X72-b8-XEC">
             <objects>
                 <tabBarController storyboardIdentifier="TabBarController" id="B80-EI-IC6" customClass="TabBarController" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="ghg-sk-34j"/>
                     <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Hos-3V-uBH">
                         <rect key="frame" x="0.0" y="0.0" width="1920" height="0.0"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </tabBar>
                     <connections>
-                        <segue destination="bz3-AU-N9p" kind="relationship" relationship="viewControllers" id="qBe-xI-8Ji"/>
-                        <segue destination="LcP-dY-3WS" kind="relationship" relationship="viewControllers" id="DRw-hP-onk"/>
-                        <segue destination="edn-dz-Nyo" kind="relationship" relationship="viewControllers" id="Wod-hu-juS"/>
-                        <segue destination="CNX-Vl-6sl" kind="relationship" relationship="viewControllers" id="Imi-Qz-LBl"/>
-                        <segue destination="8rJ-Kc-sve" kind="relationship" relationship="viewControllers" id="Ez4-nh-6zn"/>
+                        <segue destination="9pv-A4-QxB" kind="relationship" relationship="viewControllers" id="cvx-Ey-T3I"/>
+                        <segue destination="CNM-FA-Rhq" kind="relationship" relationship="viewControllers" id="qUL-b8-i7O"/>
+                        <segue destination="e0F-AO-I4l" kind="relationship" relationship="viewControllers" id="eDi-Bp-tuX"/>
+                        <segue destination="jQU-O1-Ofc" kind="relationship" relationship="viewControllers" id="ngO-E8-0SP"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="DzI-74-Owy" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -741,14 +741,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbQ-aT-Gcf">
-                                <rect key="frame" x="110" y="202" width="1700" height="778"/>
+                                <rect key="frame" x="110" y="299" width="1700" height="681"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="Run output"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                             </textView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eFn-Ut-bfl" userLabel="Header">
-                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="4MS-tD-J5S"/>
@@ -758,7 +758,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rvK-Az-k8D" customClass="TvButton">
-                                <rect key="frame" x="110" y="140" width="200" height="32"/>
+                                <rect key="frame" x="110" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="FNo-0b-Waw"/>
@@ -779,7 +779,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PXO-rZ-PXJ" customClass="TvButton">
-                                <rect key="frame" x="340" y="140" width="200" height="32"/>
+                                <rect key="frame" x="340" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="8yh-hp-kss"/>
@@ -801,7 +801,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aiX-4j-gRO" customClass="TvButton">
-                                <rect key="frame" x="860" y="140" width="200" height="32"/>
+                                <rect key="frame" x="860" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="32" id="6Qw-zg-plL"/>
@@ -823,7 +823,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="niE-sM-ZEP" customClass="TvButton">
-                                <rect key="frame" x="1150" y="140" width="200" height="32"/>
+                                <rect key="frame" x="1150" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="5xI-cd-diY"/>
@@ -844,7 +844,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0eo-Im-Mar" customClass="TvButton">
-                                <rect key="frame" x="1380" y="140" width="200" height="32"/>
+                                <rect key="frame" x="1380" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="5fM-ww-NoF"/>
@@ -865,7 +865,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TLG-f9-I9U" customClass="TvButton">
-                                <rect key="frame" x="1610" y="140" width="200" height="32"/>
+                                <rect key="frame" x="1610" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="2QI-JJ-rxK"/>
@@ -886,7 +886,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f7O-6x-bsn" customClass="TvButton">
-                                <rect key="frame" x="570" y="140" width="200" height="32"/>
+                                <rect key="frame" x="570" y="237" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.95983767649999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="bMY-Ln-tXN"/>
@@ -971,7 +971,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FFmpegKit tvOS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bN5-MO-ySd">
-                                <rect key="frame" x="80" y="157" width="1760" height="50"/>
+                                <rect key="frame" x="80" y="60" width="1760" height="50"/>
                                 <color key="backgroundColor" red="0.95686274510000002" green="0.40784313729999999" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="Agc-Ee-RKf"/>
@@ -981,7 +981,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fFA-2J-LU1" customClass="TvButton">
-                                <rect key="frame" x="920" y="279" width="80" height="32"/>
+                                <rect key="frame" x="920" y="182" width="80" height="32"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="61a-6w-O8a"/>
@@ -1002,14 +1002,14 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcH-Yv-AR4">
-                                <rect key="frame" x="100" y="341" width="1720" height="659"/>
+                                <rect key="frame" x="100" y="244" width="1720" height="756"/>
                                 <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="Run output"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                             </textView>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="chromaprint" borderStyle="roundedRect" placeholder="chromaprint, dav1d, webp, zscale" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bpo-HJ-voT" userLabel="Other Test Text">
-                                <rect key="frame" x="860" y="227" width="200" height="32"/>
+                                <rect key="frame" x="860" y="130" width="200" height="32"/>
                                 <color key="backgroundColor" red="0.90198421480000002" green="0.90588062999999996" blue="0.91761696339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="k0c-0G-PEB"/>
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/FFmpegKitTest.m b/tvos/test-app-local-dependency/FFmpegKitTVOS/FFmpegKitTest.m
index af68d67..08cfc20 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/FFmpegKitTest.m
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/FFmpegKitTest.m
@@ -77,10 +77,10 @@
 }
 
 void testParseSimpleCommand() {
-    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
+    NSArray *argumentArray = parseArguments(@"-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -fps_mode cfr video.mp4");
     
     assert(argumentArray != nil);
-    assertNumber([[NSNumber alloc] initWithInt:14], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
+    assertNumber([[NSNumber alloc] initWithInt:12], [[NSNumber alloc] initWithUnsignedLong: [argumentArray count]]);
     
     assertString(@"-hide_banner", argumentArray[0]);
     assertString(@"-loop", argumentArray[1]);
@@ -91,11 +91,9 @@ void testParseSimpleCommand() {
     assertString(@"[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
     assertString(@"-map", argumentArray[7]);
     assertString(@"[video]", argumentArray[8]);
-    assertString(@"-vsync", argumentArray[9]);
-    assertString(@"2", argumentArray[10]);
-    assertString(@"-async", argumentArray[11]);
-    assertString(@"1", argumentArray[12]);
-    assertString(@"video.mp4", argumentArray[13]);
+    assertString(@"-fps_mode", argumentArray[9]);
+    assertString(@"cfr", argumentArray[10]);
+    assertString(@"video.mp4", argumentArray[11]);
 }
 
 void testParseSingleQuotesInCommand() {
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/PipeViewController.m b/tvos/test-app-local-dependency/FFmpegKitTVOS/PipeViewController.m
index 3862b12..90e4c19 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/PipeViewController.m
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/PipeViewController.m
@@ -265,7 +265,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/SubtitleViewController.m b/tvos/test-app-local-dependency/FFmpegKitTVOS/SubtitleViewController.m
index a757a14..40e9120 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/SubtitleViewController.m
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/SubtitleViewController.m
@@ -259,7 +259,7 @@ - (void)updateProgressDialog {
     }
     
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/Video.m b/tvos/test-app-local-dependency/FFmpegKitTVOS/Video.m
index f910e28..f6bbfba 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/Video.m
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/Video.m
@@ -44,7 +44,7 @@ + (NSString*)generateCreateVideoWithPipesScript:(NSString *)image1 :(NSString *)
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateVideoEncodeScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile :(NSString *)videoCodec :(NSString *)customOptions {
@@ -71,7 +71,7 @@ + (NSString*)generateVideoEncodeScriptWithCustomPixelFormat:(NSString *)image1 :
 [stream2fadein][stream1fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream2blended];\
 [stream3fadein][stream2fadeout]overlay=(main_w-overlay_w)/2:(main_h-overlay_h)/2,trim=duration=1,select=lte(n\\,30)[stream3blended];\
 [stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,scale=w=640:h=424,format=%@[video]\" \
--map [video] -vsync 2 -async 1 %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
+-map [video] -fps_mode cfr %@-c:v %@ -r 30 %@", image1, image2, image3, pixelFormat, customOptions, videoCodec, videoFile];
 }
 
 + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :(NSString *)image3 :(NSString *)videoFile {
@@ -91,7 +91,7 @@ + (NSString*)generateShakingVideoScript:(NSString *)image1 :(NSString *)image2 :
 [3:v][stream2overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream2shaking];\
 [3:v][stream3overlaid]overlay=x=\'2*mod(n,4)\':y=\'2*mod(n,2)\',trim=duration=3[stream3shaking];\
 [stream1shaking][stream2shaking][stream3shaking]concat=n=3:v=1:a=0,scale=w=640:h=424,format=yuv420p[video]\" \
--map [video] -vsync 2 -async 1 -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
+-map [video] -fps_mode cfr -c:v mpeg4 -r 30 %@", image1, image2, image3, videoFile];
 }
 
 + (NSString*)generateZscaleVideoScript:(NSString *)inputVideoFilePath :(NSString *)outputVideoFilePath {
diff --git a/tvos/test-app-local-dependency/FFmpegKitTVOS/VideoViewController.m b/tvos/test-app-local-dependency/FFmpegKitTVOS/VideoViewController.m
index 9ba95aa..7e729c6 100644
--- a/tvos/test-app-local-dependency/FFmpegKitTVOS/VideoViewController.m
+++ b/tvos/test-app-local-dependency/FFmpegKitTVOS/VideoViewController.m
@@ -283,7 +283,7 @@ - (void)updateProgressDialog {
     }
 
     if (alertController != nil) {
-        int timeInMilliseconds = [statistics getTime];
+        double timeInMilliseconds = [statistics getTime];
         int totalVideoDuration = 9000;
 
         int percentage = timeInMilliseconds*100/totalVideoDuration;