From 81ccd7c13d2c0c7fec64a5940b69ba303f8a6055 Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Mon, 17 Oct 2022 01:08:47 +0100
Subject: [PATCH 1/8] rename StreamInformation.getFullCodec() as getCodecLong()
 on flutter

---
 flutter/flutter/lib/stream_information.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flutter/flutter/lib/stream_information.dart b/flutter/flutter/lib/stream_information.dart
index 0af0528..b16b71b 100644
--- a/flutter/flutter/lib/stream_information.dart
+++ b/flutter/flutter/lib/stream_information.dart
@@ -53,7 +53,7 @@ class StreamInformation {
   String? getCodec() => this.getStringProperty(StreamInformation.keyCodec);
 
   /// Returns stream codec in long format.
-  String? getFullCodec() =>
+  String? getCodecLong() =>
       this.getStringProperty(StreamInformation.keyCodecLong);
 
   /// Returns stream format.

From 5321a535285689a0b07e266910d2d52935f37fe1 Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Sat, 19 Nov 2022 13:20:10 +0000
Subject: [PATCH 2/8] remove android release template

---
 android/ffmpeg-kit-android-lib/build.gradle |   4 -
 tools/android/build.gradle                  |   4 -
 tools/android/build.lts.gradle              |   4 -
 tools/android/release.template.gradle       | 114 --------------------
 4 files changed, 126 deletions(-)
 delete mode 100644 tools/android/release.template.gradle

diff --git a/android/ffmpeg-kit-android-lib/build.gradle b/android/ffmpeg-kit-android-lib/build.gradle
index 43c84dd..cf35c13 100644
--- a/android/ffmpeg-kit-android-lib/build.gradle
+++ b/android/ffmpeg-kit-android-lib/build.gradle
@@ -54,7 +54,3 @@ dependencies {
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation 'org.json:json:20220320'
 }
-
-if (System.properties.containsKey('releaseFFmpegKit')) {
-    apply from: "${rootProject.projectDir}/../tools/android/release.template.gradle"
-}
diff --git a/tools/android/build.gradle b/tools/android/build.gradle
index 43c84dd..cf35c13 100644
--- a/tools/android/build.gradle
+++ b/tools/android/build.gradle
@@ -54,7 +54,3 @@ dependencies {
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation 'org.json:json:20220320'
 }
-
-if (System.properties.containsKey('releaseFFmpegKit')) {
-    apply from: "${rootProject.projectDir}/../tools/android/release.template.gradle"
-}
diff --git a/tools/android/build.lts.gradle b/tools/android/build.lts.gradle
index 869072b..4bf3b86 100644
--- a/tools/android/build.lts.gradle
+++ b/tools/android/build.lts.gradle
@@ -54,7 +54,3 @@ dependencies {
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation 'org.json:json:20220320'
 }
-
-if (System.properties.containsKey('releaseFFmpegKit')) {
-    apply from: "${rootProject.projectDir}/../tools/android/release.template.gradle"
-}
diff --git a/tools/android/release.template.gradle b/tools/android/release.template.gradle
deleted file mode 100644
index 61da992..0000000
--- a/tools/android/release.template.gradle
+++ /dev/null
@@ -1,114 +0,0 @@
-task sourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-group = 'com.arthenica'
-archivesBaseName = releaseProject
-version = releaseVersionName
-
-File propertiesFile = project.rootProject.file('local.properties')
-if (propertiesFile.exists()) {
-    Properties properties = new Properties()
-    properties.load(new FileInputStream(propertiesFile))
-    properties.each { name, value ->
-        ext[name] = value
-    }
-}
-
-ext {
-    publishedGroupId = group
-    artifact = releaseProject
-    libraryName = releaseProject
-    libraryVersion = version
-    libraryDescription = releaseProjectDescription
-
-    siteUrl = 'https://github.com/arthenica/ffmpeg-kit'
-    gitUrl = 'https://github.com/arthenica/ffmpeg-kit.git'
-
-    developerId = 'arthenica'
-    developerName = 'ARTHENICA'
-    developerEmail = 'open-source@arthenica.com'
-
-    if (Project.hasProperty('releaseGPL')) {
-        licenseName = 'GNU General Public License version 3'
-        licenseUrl = 'https://www.gnu.org/licenses/gpl-3.0.txt'
-    } else {
-        licenseName = 'GNU Lesser General Public License, Version 3'
-        licenseUrl = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
-    }
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-
-                groupId group
-                artifactId = libraryName
-                version = version
-
-                from components.release
-
-                artifact sourcesJar
-                artifact javadocJar
-
-                pom {
-                    packaging 'aar'
-                    name = libraryName
-                    description = libraryDescription
-                    url = siteUrl
-
-                    licenses {
-                        license {
-                            name = licenseName
-                            url = licenseUrl
-                        }
-                    }
-                    developers {
-                        developer {
-                            id = developerId
-                            name = developerName
-                            email = developerEmail
-                        }
-                    }
-
-                    scm {
-                        connection = gitUrl
-                        developerConnection = gitUrl
-                        url = siteUrl
-                    }
-                }
-            }
-        }
-        repositories {
-            maven {
-                var releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                var snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-                credentials {
-                    username ossrhUsername
-                    password ossrhPassword
-                }
-            }
-        }
-    }
-}
-
-
-signing {
-    sign publishing.publications
-}

From 8dd8dde9283526f2c3cd4886e683412c065efb1d Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Sun, 6 Nov 2022 20:33:01 +0000
Subject: [PATCH 3/8] allow disabling bitcode in ios and tvos, fixes #614

---
 ios.sh                   |  3 +++
 scripts/apple/ffmpeg.sh  |  4 ++++
 scripts/function-ios.sh  | 20 ++++++++++++++------
 scripts/function-tvos.sh | 24 ++++++++++++++++++------
 scripts/function.sh      |  3 +++
 tvos.sh                  |  3 +++
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/ios.sh b/ios.sh
index 0f28538..17ed291 100755
--- a/ios.sh
+++ b/ios.sh
@@ -71,6 +71,9 @@ while [ ! $# -eq 0 ]; do
 
     skip_library "${SKIP_LIBRARY}"
     ;;
+  --no-bitcode)
+    export NO_BITCODE="1"
+    ;;
   --no-framework)
     NO_FRAMEWORK="1"
     ;;
diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh
index 8d3c052..45feb2c 100755
--- a/scripts/apple/ffmpeg.sh
+++ b/scripts/apple/ffmpeg.sh
@@ -98,6 +98,10 @@ x86-64-mac-catalyst)
   ;;
 esac
 
+if [ ! -z $NO_BITCODE ]; then
+  BITCODE_FLAGS=""
+fi
+
 CONFIGURE_POSTFIX=""
 HIGH_PRIORITY_LDFLAGS=""
 
diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh
index 2853c96..02ae7c3 100755
--- a/scripts/function-ios.sh
+++ b/scripts/function-ios.sh
@@ -55,9 +55,9 @@ libraries are created under the prebuilt folder.\n"
   display_help_gpl_libraries
   display_help_custom_libraries
   if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
-    display_help_advanced_options "  --no-framework\t\tdo not build xcframework bundles [no]"
+    display_help_advanced_options "  --no-framework\t\tdo not build xcframework bundles [no]"  "  --no-bitcode\t\t\tdo not enable bitcode in bundles [no]"
   else
-    display_help_advanced_options "  --no-framework\t\tdo not build framework bundles [no]"
+    display_help_advanced_options "  --no-framework\t\tdo not build framework bundles [no]"  "  --no-bitcode\t\t\tdo not enable bitcode in bundles [no]"
   fi
 }
 
@@ -105,16 +105,19 @@ get_common_cflags() {
   fi
 
   local BUILD_DATE="-DFFMPEG_KIT_BUILD_DATE=$(date +%Y%m%d 2>>"${BASEDIR}"/build.log)"
+  if [ -z $NO_BITCODE ]; then
+    local BITCODE_FLAGS="-fembed-bitcode"
+  fi
 
   case ${ARCH} in
   i386 | x86-64 | arm64-simulator)
     echo "-fstrict-aliasing -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
     ;;
   *-mac-catalyst)
-    echo "-fstrict-aliasing -fembed-bitcode -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
     ;;
   *)
-    echo "-fstrict-aliasing -fembed-bitcode -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
     ;;
   esac
 }
@@ -278,7 +281,9 @@ get_cxxflags() {
   local BITCODE_FLAGS=""
   case ${ARCH} in
   armv7 | armv7s | arm64 | arm64e | *-mac-catalyst)
-    local BITCODE_FLAGS="-fembed-bitcode"
+    if [ -z $NO_BITCODE ]; then
+      local BITCODE_FLAGS="-fembed-bitcode"
+    fi
     ;;
   esac
 
@@ -384,12 +389,15 @@ get_ldflags() {
     local OPTIMIZATION_FLAGS="${FFMPEG_KIT_DEBUG}"
   fi
   local COMMON_FLAGS=$(get_common_ldflags)
+  if [ -z $NO_BITCODE ]; then
+    local BITCODE_FLAGS="-fembed-bitcode -Wc,-fembed-bitcode"
+  fi
 
   case $1 in
   ffmpeg-kit)
     case ${ARCH} in
     armv7 | armv7s | arm64 | arm64e | *-mac-catalyst)
-      echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} -fembed-bitcode -Wc,-fembed-bitcode ${OPTIMIZATION_FLAGS}"
+      echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"
       ;;
     *)
       echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} ${OPTIMIZATION_FLAGS}"
diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh
index 98dc5b6..f36f0f6 100755
--- a/scripts/function-tvos.sh
+++ b/scripts/function-tvos.sh
@@ -43,9 +43,9 @@ set explicitly. When compilation ends, libraries are created under the prebuilt
   display_help_gpl_libraries
   display_help_custom_libraries
   if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
-    display_help_advanced_options "  --no-framework\t\tdo not build xcframework bundles [no]"
+    display_help_advanced_options "  --no-framework\t\tdo not build xcframework bundles [no]"  "  --no-bitcode\t\t\tdo not enable bitcode in bundles [no]"
   else
-    display_help_advanced_options "  --no-framework\t\tdo not build framework bundles [no]"
+    display_help_advanced_options "  --no-framework\t\tdo not build framework bundles [no]"  "  --no-bitcode\t\t\tdo not enable bitcode in bundles [no]"
   fi
 }
 
@@ -79,10 +79,13 @@ get_common_cflags() {
   fi
 
   local BUILD_DATE="-DFFMPEG_KIT_BUILD_DATE=$(date +%Y%m%d 2>>"${BASEDIR}"/build.log)"
+  if [ -z $NO_BITCODE ]; then
+    local BITCODE_FLAGS="-fembed-bitcode"
+  fi
 
   case ${ARCH} in
   arm64)
-    echo "-fstrict-aliasing -fembed-bitcode -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
     ;;
   x86-64 | arm64-simulator)
     echo "-fstrict-aliasing -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
@@ -254,7 +257,9 @@ get_cxxflags() {
   local BITCODE_FLAGS=""
   case ${ARCH} in
   arm64)
-    local BITCODE_FLAGS="-fembed-bitcode"
+    if [ -z $NO_BITCODE ]; then
+      local BITCODE_FLAGS="-fembed-bitcode"
+    fi
     ;;
   esac
 
@@ -320,9 +325,13 @@ get_size_optimization_ldflags() {
 }
 
 get_arch_specific_ldflags() {
+  if [ -z $NO_BITCODE ]; then
+    local BITCODE_FLAGS="-fembed-bitcode"
+  fi
+
   case ${ARCH} in
   arm64)
-    echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode"
+    echo "-arch arm64 -march=armv8-a+crc+crypto ${BITCODE_FLAGS}"
     ;;
   arm64-simulator)
     echo "-arch arm64 -march=armv8-a+crc+crypto"
@@ -342,12 +351,15 @@ get_ldflags() {
     local OPTIMIZATION_FLAGS="${FFMPEG_KIT_DEBUG}"
   fi
   local COMMON_FLAGS=$(get_common_ldflags)
+  if [ -z $NO_BITCODE ]; then
+    local BITCODE_FLAGS="-fembed-bitcode -Wc,-fembed-bitcode"
+  fi
 
   case $1 in
   ffmpeg-kit)
     case ${ARCH} in
     arm64)
-      echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} -fembed-bitcode -Wc,-fembed-bitcode ${OPTIMIZATION_FLAGS}"
+      echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"
       ;;
     *)
       echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} ${OPTIMIZATION_FLAGS}"
diff --git a/scripts/function.sh b/scripts/function.sh
index a3dedf6..c82eb96 100755
--- a/scripts/function.sh
+++ b/scripts/function.sh
@@ -927,6 +927,9 @@ display_help_advanced_options() {
   if [ -n "$1" ]; then
     echo -e "$1"
   fi
+  if [ -n "$2" ]; then
+    echo -e "$2"
+  fi
   echo -e ""
 }
 
diff --git a/tvos.sh b/tvos.sh
index ac097a8..1165963 100755
--- a/tvos.sh
+++ b/tvos.sh
@@ -71,6 +71,9 @@ while [ ! $# -eq 0 ]; do
 
     skip_library "${SKIP_LIBRARY}"
     ;;
+  --no-bitcode)
+    export NO_BITCODE="1"
+    ;;
   --no-framework)
     NO_FRAMEWORK="1"
     ;;

From 3ca2a170751889b8cd9d01bf05cb2b684a4343b3 Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Fri, 21 Oct 2022 21:04:58 +0100
Subject: [PATCH 4/8] make build scripts more tolerant against the space
 character in path

---
 apple.sh            |  8 ++++----
 scripts/function.sh | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apple.sh b/apple.sh
index fe3b21f..38c21c8 100755
--- a/apple.sh
+++ b/apple.sh
@@ -56,14 +56,14 @@ create_umbrella_xcframework() {
   local BUILD_COMMAND="xcodebuild -create-xcframework "
 
   for ARCHITECTURE_VARIANT_INDEX in "${TARGET_ARCHITECTURE_VARIANT_INDEX_ARRAY[@]}"; do
-    local FRAMEWORK_PATH=${BASEDIR}/prebuilt/$(get_framework_directory "${ARCHITECTURE_VARIANT_INDEX}")/${FRAMEWORK_NAME}.framework
-    BUILD_COMMAND+=" -framework ${FRAMEWORK_PATH}"
+    local FRAMEWORK_PATH="${BASEDIR}"/prebuilt/$(get_framework_directory "${ARCHITECTURE_VARIANT_INDEX}")/${FRAMEWORK_NAME}.framework
+    BUILD_COMMAND+=" -framework \"${FRAMEWORK_PATH}\""
   done
 
-  BUILD_COMMAND+=" -output ${XCFRAMEWORK_PATH}"
+  BUILD_COMMAND+=" -output \"${XCFRAMEWORK_PATH}\""
 
   # EXECUTE CREATE FRAMEWORK COMMAND
-  COMMAND_OUTPUT=$(${BUILD_COMMAND} 2>&1)
+  COMMAND_OUTPUT=$(eval ${BUILD_COMMAND} 2>&1)
   RC=$?
   echo -e "DEBUG: ${COMMAND_OUTPUT}\n" 1>>"${BASEDIR}"/build.log 2>&1
 
diff --git a/scripts/function.sh b/scripts/function.sh
index c82eb96..421cb80 100755
--- a/scripts/function.sh
+++ b/scripts/function.sh
@@ -1924,53 +1924,53 @@ autoreconf_library() {
 clone_git_repository_with_commit_id() {
   local RC
 
-  (mkdir -p $2 1>>"${BASEDIR}"/build.log 2>&1)
+  (mkdir -p "$2" 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to create local directory $2\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $2 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$2" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi
 
   echo -e "INFO: Cloning commit id $3 from repository $1 into local directory $2\n" 1>>"${BASEDIR}"/build.log 2>&1
 
-  (git clone $1 $2 --depth 1 1>>"${BASEDIR}"/build.log 2>&1)
+  (git clone "$1" "$2" --depth 1 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to clone $1\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $2 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$2" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi
 
-  cd $2 1>>"${BASEDIR}"/build.log 2>&1
+  cd "$2" 1>>"${BASEDIR}"/build.log 2>&1
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to cd into $2\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $2 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$2" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi
 
-  (git fetch --depth 1 origin $3 1>>"${BASEDIR}"/build.log 2>&1)
+  (git fetch --depth 1 origin "$3" 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to fetch commit id $3 from $1\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $2 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$2" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi
 
-  (git checkout $3 1>>"${BASEDIR}"/build.log 2>&1)
+  (git checkout "$3" 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
@@ -1991,26 +1991,26 @@ clone_git_repository_with_commit_id() {
 clone_git_repository_with_tag() {
   local RC
 
-  (mkdir -p $3 1>>"${BASEDIR}"/build.log 2>&1)
+  (mkdir -p "$3" 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to create local directory $3\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $3 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$3" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi
 
   echo -e "INFO: Cloning tag $2 from repository $1 into local directory $3\n" 1>>"${BASEDIR}"/build.log 2>&1
 
-  (git clone --depth 1 --branch $2 $1 $3 1>>"${BASEDIR}"/build.log 2>&1)
+  (git clone --depth 1 --branch "$2" "$1" "$3" 1>>"${BASEDIR}"/build.log 2>&1)
 
   RC=$?
 
   if [ ${RC} -ne 0 ]; then
     echo -e "\nINFO: Failed to clone $1 -> $2\n" 1>>"${BASEDIR}"/build.log 2>&1
-    rm -rf $3 1>>"${BASEDIR}"/build.log 2>&1
+    rm -rf "$3" 1>>"${BASEDIR}"/build.log 2>&1
     echo ${RC}
     return
   fi

From 5329f9b490c7ef17923cb8f8ab9420c73777a9a8 Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Fri, 21 Oct 2022 22:40:54 +0100
Subject: [PATCH 5/8] decommission macos 10-15 in github workflows

---
 .github/workflows/android-build-scripts.yml |  4 +--
 .github/workflows/ios-build-scripts.yml     | 29 +++------------------
 .github/workflows/macos-build-scripts.yml   | 29 +++------------------
 .github/workflows/periodic-builds-apple.yml | 18 ++++++-------
 .github/workflows/tvos-build-scripts.yml    | 29 +++------------------
 5 files changed, 20 insertions(+), 89 deletions(-)

diff --git a/.github/workflows/android-build-scripts.yml b/.github/workflows/android-build-scripts.yml
index e91cd46..b60e25a 100644
--- a/.github/workflows/android-build-scripts.yml
+++ b/.github/workflows/android-build-scripts.yml
@@ -85,7 +85,7 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-main-on-macos:
     name: android main on macos
-    runs-on: macos-10.15
+    runs-on: macos-12
     strategy:
       matrix:
         ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin', 'r24-darwin', 'r25b-darwin' ]
@@ -114,7 +114,7 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-lts-on-macos:
     name: android lts on macos
-    runs-on: macos-10.15
+    runs-on: macos-11
     strategy:
       matrix:
         ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ]
diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml
index 729f983..29d8978 100644
--- a/.github/workflows/ios-build-scripts.yml
+++ b/.github/workflows/ios-build-scripts.yml
@@ -73,38 +73,15 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-catalina:
-    name: ios main on catalina
-    runs-on: macos-10.15
+  build-lts-on-macos-bigsur:
+    name: ios lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '11.7', '12.4' ]
     defaults:
       run:
         shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - name: print ffbuild logs
-        if: ${{ failure() }}
-        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos:
-    name: ios lts
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        xcode: [ '10.3', '11.7' ]
-    defaults:
-      run:
-        shell: bash
     steps:
       - uses: actions/checkout@v2
       - name: prerequisites
diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml
index cfca086..fb2d35b 100644
--- a/.github/workflows/macos-build-scripts.yml
+++ b/.github/workflows/macos-build-scripts.yml
@@ -73,38 +73,15 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-catalina:
-    name: macos main on catalina
-    runs-on: macos-10.15
+  build-lts-on-macos-bigsur:
+    name: macos lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '11.7', '12.4' ]
     defaults:
       run:
         shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - name: print ffbuild logs
-        if: ${{ failure() }}
-        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos:
-    name: macos lts
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        xcode: [ '10.3', '11.7' ]
-    defaults:
-      run:
-        shell: bash
     steps:
       - uses: actions/checkout@v2
       - name: prerequisites
diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml
index 6099d07..d9d480b 100644
--- a/.github/workflows/periodic-builds-apple.yml
+++ b/.github/workflows/periodic-builds-apple.yml
@@ -31,9 +31,9 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-ios-lts-on-macos-catalina:
-    name: ios lts on catalina
-    runs-on: macos-10.15
+  build-ios-lts-on-macos-bigsur:
+    name: ios lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '12.4' ]
@@ -83,9 +83,9 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-macos-lts-on-macos-catalina:
-    name: macos lts on catalina
-    runs-on: macos-10.15
+  build-macos-lts-on-macos-bigsur:
+    name: macos lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '12.4' ]
@@ -135,9 +135,9 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-tvos-lts-on-macos-catalina:
-    name: tvos lts on catalina
-    runs-on: macos-10.15
+  build-tvos-lts-on-macos-bigsur:
+    name: tvos lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '12.4' ]
diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml
index c5e3c0a..1169942 100644
--- a/.github/workflows/tvos-build-scripts.yml
+++ b/.github/workflows/tvos-build-scripts.yml
@@ -73,38 +73,15 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-catalina:
-    name: tvos main on catalina
-    runs-on: macos-10.15
+  build-lts-on-macos-bigsur:
+    name: tvos lts on big sur
+    runs-on: macos-11
     strategy:
       matrix:
         xcode: [ '11.7', '12.4' ]
     defaults:
       run:
         shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - name: print ffbuild logs
-        if: ${{ failure() }}
-        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos:
-    name: tvos lts
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        xcode: [ '10.3', '11.7' ]
-    defaults:
-      run:
-        shell: bash
     steps:
       - uses: actions/checkout@v2
       - name: prerequisites

From 91026936cb80c44d7779465d2e3025f13d6c481a Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 16 Jul 2023 11:50:00 +0200
Subject: [PATCH 6/8] added namespace for AGP8 compatibility

---
 flutter/flutter/android/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flutter/flutter/android/build.gradle b/flutter/flutter/android/build.gradle
index 7c6b559..5e80b5a 100644
--- a/flutter/flutter/android/build.gradle
+++ b/flutter/flutter/android/build.gradle
@@ -19,6 +19,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.arthenica.ffmpegkit.flutter'
+    }
+
     compileSdkVersion 31
 
     defaultConfig {

From 5fc7041abec4f2821dd75d5175302636e9ea25bd Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Sun, 16 Jul 2023 12:42:05 +0100
Subject: [PATCH 7/8] remove funding options

---
 .github/FUNDING.yml | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 0c08990..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-patreon: tanersener
-open_collective: ffmpeg-kit
-custom: [ 'https://buymeacoff.ee/tanersener' ]
\ No newline at end of file

From 471d38b5c216f09a135a46f7cc62a42502df3d46 Mon Sep 17 00:00:00 2001
From: "Sue N. Cooper" <suencooper@outlook.com>
Date: Sat, 26 Aug 2023 23:22:27 +0300
Subject: [PATCH 8/8] release flutter v6.0.0

---
 flutter/flutter/.gitignore                    |  1 +
 flutter/flutter/.pubignore                    |  5 +++
 flutter/flutter/CHANGELOG.md                  | 10 ++++++
 flutter/flutter/README.md                     |  8 ++---
 flutter/flutter/android/build.gradle          | 14 ++++----
 .../ios/Classes/FFmpegKitFlutterPlugin.m      |  2 +-
 .../flutter/ios/ffmpeg_kit_flutter.podspec    | 34 +++++++++----------
 .../flutter/lib/src/ffmpeg_kit_factory.dart   |  2 +-
 flutter/flutter/lib/statistics.dart           |  6 ++--
 .../macos/Classes/FFmpegKitFlutterPlugin.m    |  2 +-
 .../flutter/macos/ffmpeg_kit_flutter.podspec  | 34 +++++++++----------
 flutter/flutter/pubspec.yaml                  |  6 ++--
 12 files changed, 70 insertions(+), 54 deletions(-)
 create mode 100644 flutter/flutter/.pubignore

diff --git a/flutter/flutter/.gitignore b/flutter/flutter/.gitignore
index 16f71de..44408ea 100644
--- a/flutter/flutter/.gitignore
+++ b/flutter/flutter/.gitignore
@@ -3,3 +3,4 @@
 .packages
 .pub/
 build/
+pubspec.lock
diff --git a/flutter/flutter/.pubignore b/flutter/flutter/.pubignore
new file mode 100644
index 0000000..e85b428
--- /dev/null
+++ b/flutter/flutter/.pubignore
@@ -0,0 +1,5 @@
+.DS_Store
+.idea
+.pub
+.dart_tool
+pubspec.lock
diff --git a/flutter/flutter/CHANGELOG.md b/flutter/flutter/CHANGELOG.md
index 38e6d3f..1879bf0 100644
--- a/flutter/flutter/CHANGELOG.md
+++ b/flutter/flutter/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 6.0.0
+- Feature release based on native v6.0
+- Renames StreamInformation.getFullCodec() method to getCodecLong()
+- Improves Statistics.getTime() method to return milliseconds as double
+
+## 6.0.0-LTS
+- Feature release based on native v6.0.LTS
+- Renames StreamInformation.getFullCodec() method to getCodecLong()
+- Improves Statistics.getTime() method to return milliseconds as double
+
 ## 5.1.0
 - Feature release based on native v5.1
 - Implements AbstractSession.cancel() method
diff --git a/flutter/flutter/README.md b/flutter/flutter/README.md
index b5623bd..63f2602 100644
--- a/flutter/flutter/README.md
+++ b/flutter/flutter/README.md
@@ -5,7 +5,7 @@
 - Includes both `FFmpeg` and `FFprobe`
 - Supports
     - `Android`, `iOS` and `macOS`
-    - FFmpeg `v5.1.2`
+    - FFmpeg `v6.0`
     - `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures on Android
     - `Android API Level 24` or later
       - `API Level 16` on LTS releases
@@ -35,7 +35,7 @@ Add `ffmpeg_kit_flutter` as a dependency in your `pubspec.yaml file`.
 
 ```yaml
 dependencies:
-  ffmpeg_kit_flutter: 5.1.0
+  ffmpeg_kit_flutter: 6.0.0
 ```
 
 #### 2.1 Packages
@@ -58,7 +58,7 @@ using the following dependency format.
 
 ```yaml
 dependencies:
-  ffmpeg_kit_flutter_<package name>: 5.1.0
+  ffmpeg_kit_flutter_<package name>: 6.0.0
 ```
 
 Note that hyphens in the package name must be replaced with underscores. Additionally, do not forget to use the package
@@ -70,7 +70,7 @@ In order to install the `LTS` variant, append `-LTS` to the version you have for
 
 ```yaml
 dependencies:
-  ffmpeg_kit_flutter: 5.1.0-LTS
+  ffmpeg_kit_flutter: 6.0.0-LTS
 ```
 
 #### 2.4 LTS Releases
diff --git a/flutter/flutter/android/build.gradle b/flutter/flutter/android/build.gradle
index 5e80b5a..3f04b74 100644
--- a/flutter/flutter/android/build.gradle
+++ b/flutter/flutter/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
 }
 
@@ -24,13 +24,13 @@ android {
         namespace 'com.arthenica.ffmpegkit.flutter'
     }
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 31
-        versionCode 510
-        versionName "5.1.0"
+        targetSdkVersion 33
+        versionCode 600
+        versionName "6.0.0"
     }
 
     buildTypes {
@@ -48,6 +48,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.2.0'
-    implementation 'com.arthenica:ffmpeg-kit-https:5.1'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'com.arthenica:ffmpeg-kit-https:6.0'
 }
diff --git a/flutter/flutter/ios/Classes/FFmpegKitFlutterPlugin.m b/flutter/flutter/ios/Classes/FFmpegKitFlutterPlugin.m
index a2dac73..3ac9d64 100644
--- a/flutter/flutter/ios/Classes/FFmpegKitFlutterPlugin.m
+++ b/flutter/flutter/ios/Classes/FFmpegKitFlutterPlugin.m
@@ -1128,7 +1128,7 @@ extern int const AbstractSessionDefaultTimeoutForAsynchronousMessagesInTransmit;
     dictionary[KEY_STATISTICS_VIDEO_FPS] = [NSNumber numberWithFloat: [statistics getVideoFps]];
     dictionary[KEY_STATISTICS_VIDEO_QUALITY] = [NSNumber numberWithFloat: [statistics getVideoQuality]];
     dictionary[KEY_STATISTICS_SIZE] = [NSNumber numberWithLong: [statistics getSize]];
-    dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithInt: [statistics getTime]];
+    dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithDouble: [statistics getTime]];
     dictionary[KEY_STATISTICS_BITRATE] = [NSNumber numberWithDouble: [statistics getBitrate]];
     dictionary[KEY_STATISTICS_SPEED] = [NSNumber numberWithDouble: [statistics getSpeed]];
 
diff --git a/flutter/flutter/ios/ffmpeg_kit_flutter.podspec b/flutter/flutter/ios/ffmpeg_kit_flutter.podspec
index afd9360..0d6b034 100644
--- a/flutter/flutter/ios/ffmpeg_kit_flutter.podspec
+++ b/flutter/flutter/ios/ffmpeg_kit_flutter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ffmpeg_kit_flutter'
-  s.version          = '5.1.0'
+  s.version          = '6.0.0'
   s.summary          = 'FFmpeg Kit for Flutter'
   s.description      = 'A Flutter plugin for running FFmpeg and FFprobe commands.'
   s.homepage         = 'https://github.com/arthenica/ffmpeg-kit'
@@ -23,112 +23,112 @@ Pod::Spec.new do |s|
   s.subspec 'min' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-min', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-min', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'min-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-min', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-min', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'min-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-min-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-min-gpl', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'min-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-min-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-min-gpl', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'https' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-https', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-https', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'https-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-https', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-https', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'https-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-https-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-https-gpl', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'https-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-https-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-https-gpl', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'audio' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-audio', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-audio', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'audio-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-audio', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-audio', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'video' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-video', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-video', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'video-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-video', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-video', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'full' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-full', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-full', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'full-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-full', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-full', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
   s.subspec 'full-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-full-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-ios-full-gpl', "6.0"
     ss.ios.deployment_target = '12.1'
   end
 
   s.subspec 'full-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-ios-full-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-ios-full-gpl', "6.0.LTS"
     ss.ios.deployment_target = '10'
   end
 
diff --git a/flutter/flutter/lib/src/ffmpeg_kit_factory.dart b/flutter/flutter/lib/src/ffmpeg_kit_factory.dart
index d72fca1..d2c55c3 100644
--- a/flutter/flutter/lib/src/ffmpeg_kit_factory.dart
+++ b/flutter/flutter/lib/src/ffmpeg_kit_factory.dart
@@ -99,7 +99,7 @@ class FFmpegKitFactory {
     }
   }
 
-  static String getVersion() => "5.1.0";
+  static String getVersion() => "6.0.0";
 
   static LogRedirectionStrategy? getLogRedirectionStrategy(int? sessionId) =>
       logRedirectionStrategyMap[sessionId];
diff --git a/flutter/flutter/lib/statistics.dart b/flutter/flutter/lib/statistics.dart
index 9fbdcd2..513a3f4 100644
--- a/flutter/flutter/lib/statistics.dart
+++ b/flutter/flutter/lib/statistics.dart
@@ -24,7 +24,7 @@ class Statistics {
   double _videoFps;
   double _videoQuality;
   int _size;
-  int _time;
+  double _time;
   double _bitrate;
   double _speed;
 
@@ -61,9 +61,9 @@ class Statistics {
     this._size = size;
   }
 
-  int getTime() => this._time;
+  double getTime() => this._time;
 
-  void setTime(int time) {
+  void setTime(double time) {
     this._time = time;
   }
 
diff --git a/flutter/flutter/macos/Classes/FFmpegKitFlutterPlugin.m b/flutter/flutter/macos/Classes/FFmpegKitFlutterPlugin.m
index b616988..da72fdc 100644
--- a/flutter/flutter/macos/Classes/FFmpegKitFlutterPlugin.m
+++ b/flutter/flutter/macos/Classes/FFmpegKitFlutterPlugin.m
@@ -1128,7 +1128,7 @@ extern int const AbstractSessionDefaultTimeoutForAsynchronousMessagesInTransmit;
     dictionary[KEY_STATISTICS_VIDEO_FPS] = [NSNumber numberWithFloat: [statistics getVideoFps]];
     dictionary[KEY_STATISTICS_VIDEO_QUALITY] = [NSNumber numberWithFloat: [statistics getVideoQuality]];
     dictionary[KEY_STATISTICS_SIZE] = [NSNumber numberWithLong: [statistics getSize]];
-    dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithInt: [statistics getTime]];
+    dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithDouble: [statistics getTime]];
     dictionary[KEY_STATISTICS_BITRATE] = [NSNumber numberWithDouble: [statistics getBitrate]];
     dictionary[KEY_STATISTICS_SPEED] = [NSNumber numberWithDouble: [statistics getSpeed]];
 
diff --git a/flutter/flutter/macos/ffmpeg_kit_flutter.podspec b/flutter/flutter/macos/ffmpeg_kit_flutter.podspec
index ee93a39..ae29e06 100644
--- a/flutter/flutter/macos/ffmpeg_kit_flutter.podspec
+++ b/flutter/flutter/macos/ffmpeg_kit_flutter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ffmpeg_kit_flutter'
-  s.version          = '5.1.0'
+  s.version          = '6.0.0'
   s.summary          = 'FFmpeg Kit for Flutter'
   s.description      = 'A Flutter plugin for running FFmpeg and FFprobe commands.'
   s.homepage         = 'https://github.com/arthenica/ffmpeg-kit'
@@ -23,112 +23,112 @@ Pod::Spec.new do |s|
   s.subspec 'min' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-min', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-min', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'min-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-min', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-min', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'min-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-min-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-min-gpl', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'min-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-min-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-min-gpl', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'https' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-https', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-https', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'https-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-https', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-https', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'https-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-https-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-https-gpl', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'https-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-https-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-https-gpl', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'audio' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-audio', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-audio', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'audio-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-audio', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-audio', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'video' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-video', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-video', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'video-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-video', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-video', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'full' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-full', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-full', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'full-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-full', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-full', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
   s.subspec 'full-gpl' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-full-gpl', "5.1"
+    ss.dependency 'ffmpeg-kit-macos-full-gpl', "6.0"
     ss.osx.deployment_target = '10.15'
   end
 
   s.subspec 'full-gpl-lts' do |ss|
     ss.source_files         = 'Classes/**/*'
     ss.public_header_files  = 'Classes/**/*.h'
-    ss.dependency 'ffmpeg-kit-macos-full-gpl', "5.1.LTS"
+    ss.dependency 'ffmpeg-kit-macos-full-gpl', "6.0.LTS"
     ss.osx.deployment_target = '10.12'
   end
 
diff --git a/flutter/flutter/pubspec.yaml b/flutter/flutter/pubspec.yaml
index c592e26..08421ae 100644
--- a/flutter/flutter/pubspec.yaml
+++ b/flutter/flutter/pubspec.yaml
@@ -3,10 +3,10 @@ description: FFmpeg Kit for Flutter. Supports Android, iOS and macOS platforms.
 repository: https://github.com/arthenica/ffmpeg-kit
 issue_tracker: https://github.com/arthenica/ffmpeg-kit/issues
 homepage: https://github.com/arthenica/ffmpeg-kit
-version: 5.1.0
+version: 6.0.0
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=2.0.0"
 
 flutter:
@@ -28,4 +28,4 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  plugin_platform_interface: ^2.1.3
+  plugin_platform_interface: ^2.1.5