From e41fc9427ffb901ce213feb979b40327e6386370 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Thu, 20 Aug 2020 00:13:56 +0200
Subject: [PATCH 01/54] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a5c34c7..86e9e2b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,7 +51,7 @@ install:
       C:\msys64\usr\bin\pacman -Sc --noconfirm
     )
   - C:\msys64\usr\bin\pacman -S --noconfirm --needed diffutils patch pkg-config nasm yasm
-  - set FF_BRANCH=%FF_VERSION%
+  - set FF_BRANCH=master
   - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
   - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_VERSION%
   - if /i %_PLATFORM%==desktop (
@@ -95,4 +95,4 @@ deploy:
   password:
     secure: 2mQg4oxdX8S7rMJz2TCGGg==
   folder: /home/frs/project/avbuild/windows-%_PLATFORM% # why always relative path even if starts with / ? I have to make a link home/frs/project/avbuild/xxx => /home/frs/project/avbuild/xxx
-  active_mode: false
\ No newline at end of file
+  active_mode: false

From 8dc05e7c091423b6fac6b70198d717a516d40d23 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Thu, 20 Aug 2020 00:15:13 +0200
Subject: [PATCH 02/54] Update appveyor.yml

---
 appveyor.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 86e9e2b..1c3da3f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,8 +3,6 @@ branches:
   only:
     - master
     - prelease
-    - ci
-    - appveyor
 
 # https://www.appveyor.com/docs/build-environment/#using-multiple-images-for-the-same-build
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
@@ -19,15 +17,6 @@ environment:
   - _CC: MINGW
     _PLATFORM: desktop
     _CACHE: msys64
-  - _ARCH: arm
-    _CC: VS2013
-    _PLATFORM: phone
-  - _ARCH: x86
-    _CC: VS2013
-    _PLATFORM: store
-  - _ARCH: x86
-    _CC: VS2013
-    _PLATFORM: desktop
 
 matrix:
   fast_finish: false

From 1ffe4257baf507b889fbf7034688534f75ecc6d7 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 21 Aug 2020 01:04:59 +0200
Subject: [PATCH 03/54] Update appveyor.yml

---
 appveyor.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1c3da3f..999b39e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,9 +11,6 @@ environment:
   - _CC: VS2019
     _PLATFORM: desktop
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-  - _CC: VS2019
-    _PLATFORM: store
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
   - _CC: MINGW
     _PLATFORM: desktop
     _CACHE: msys64

From e8bfb716fb6ac4d1e206939d68824a70ca96aea0 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 21 Aug 2020 02:33:03 +0200
Subject: [PATCH 04/54] Rename config-lite.sh to config.sh

---
 config-lite.sh => config.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename config-lite.sh => config.sh (100%)

diff --git a/config-lite.sh b/config.sh
similarity index 100%
rename from config-lite.sh
rename to config.sh

From 6619c31b6c84d753a15903700117bc448dea6549 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 21 Aug 2020 02:36:59 +0200
Subject: [PATCH 05/54] Update appveyor.yml

---
 appveyor.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 999b39e..71a61cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,6 @@
 branches:
   only:
     - master
-    - prelease
 
 # https://www.appveyor.com/docs/build-environment/#using-multiple-images-for-the-same-build
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
@@ -11,9 +10,6 @@ environment:
   - _CC: VS2019
     _PLATFORM: desktop
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-  - _CC: MINGW
-    _PLATFORM: desktop
-    _CACHE: msys64
 
 matrix:
   fast_finish: false

From 970457e8f5c134bf821245bba5bbe276aabd2e5e Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 01:54:33 +0200
Subject: [PATCH 06/54] Update appveyor.yml

---
 appveyor.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 71a61cc..f36b5ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -69,12 +69,3 @@ test: off
 artifacts:
   - path: '%SDK_NAME%.7z'  # relative to repo root
 
-deploy:
-  provider: FTP
-  protocol: sftp
-  host: frs.sourceforge.net
-  username: novesky
-  password:
-    secure: 2mQg4oxdX8S7rMJz2TCGGg==
-  folder: /home/frs/project/avbuild/windows-%_PLATFORM% # why always relative path even if starts with / ? I have to make a link home/frs/project/avbuild/xxx => /home/frs/project/avbuild/xxx
-  active_mode: false

From 1a3c503724e75af0455fe9f894d06bd920ab87bc Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 02:30:42 +0200
Subject: [PATCH 07/54] Update appveyor.yml

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f36b5ce..7f0e581 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,9 @@ branches:
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
 environment:
   matrix:
-  - _CC: VS2019
-    _PLATFORM: desktop
+  - _ARCH: arm64
+    _CC: VS2019
+    _PLATFORM: android
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 matrix:
@@ -36,8 +37,7 @@ install:
   - set FF_BRANCH=master
   - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
   - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_VERSION%
-  - if /i %_PLATFORM%==desktop (
-      appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
+  - appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
       7z x -y dep.7z -otools &&
       set PKG_CONFIG_PATH_MFX=%CD%\tools\%_CC%%_ARCH%\lib\pkgconfig)
 

From d3b55efb499352e5a20b8bf37c6a018d2b00847d Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:27:55 +0200
Subject: [PATCH 08/54] Update appveyor.yml

---
 appveyor.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7f0e581..e0ad5eb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,9 +8,9 @@ branches:
 environment:
   matrix:
   - _ARCH: arm64
-    _CC: VS2019
+    _CC: MINGW
+    _CACHE: msys64
     _PLATFORM: android
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 matrix:
   fast_finish: false
@@ -39,7 +39,7 @@ install:
   - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_VERSION%
   - appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
       7z x -y dep.7z -otools &&
-      set PKG_CONFIG_PATH_MFX=%CD%\tools\%_CC%%_ARCH%\lib\pkgconfig)
+      set PKG_CONFIG_PATH_MFX=%CD%\tools\%_CC%%_ARCH%\lib\pkgconfig
 
 before_build:
   - set HOME=%CD%
@@ -49,15 +49,19 @@ before_build:
 
 build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
-  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
-  - if /i %_CC%==MinGW (
-      set VC_BUILD=false&&
-      set MSYS2_PATH_TYPE=&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh mingw
-    ) else (
-      set BUILD_NOW=true&&
-      tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all
-    )
+#  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
+#  - if /i %_PLATFORM%==android (
+     set VC_BUILD=false&&
+#      set MSYS2_PATH_TYPE=&&
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang"
+ # - if /i %_CC%==MinGW (
+ #     set VC_BUILD=false&&
+ #     set MSYS2_PATH_TYPE=&&
+ #     C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang arm64"
+ #   ) else (
+ #     set BUILD_NOW=true&&
+ #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all
+ #   )
 
 after_build:
   - set SDK_NAME=ffmpeg-%FF_VERSION%-%_PLATFORM%-%_CC%%_ARCH%%CONFIG_SUFFIX%

From 3da2aacef078aa2720c473f6d029a2193a391323 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:30:05 +0200
Subject: [PATCH 09/54] Update appveyor.yml

---
 appveyor.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e0ad5eb..f468fce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,10 +50,11 @@ before_build:
 build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
-#  - if /i %_PLATFORM%==android (
+  - if /i %_PLATFORM%==android (
      set VC_BUILD=false&&
-#      set MSYS2_PATH_TYPE=&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang"
+      set MSYS2_PATH_TYPE=&&
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64-clang
+      )
  # - if /i %_CC%==MinGW (
  #     set VC_BUILD=false&&
  #     set MSYS2_PATH_TYPE=&&

From 3fc0127dc2134f3840e011ecbf0416b151c4dfcb Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:36:51 +0200
Subject: [PATCH 10/54] Update appveyor.yml

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f468fce..99bd5a6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,8 @@ environment:
   matrix:
   - _ARCH: arm64
     _CC: MINGW
-    _CACHE: msys64
-    _PLATFORM: android
+ #   _CACHE: msys64
+ #   _PLATFORM: android
 
 matrix:
   fast_finish: false
@@ -50,10 +50,10 @@ before_build:
 build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
-  - if /i %_PLATFORM%==android (
+  - if /i %_CC%==MinGW (
      set VC_BUILD=false&&
       set MSYS2_PATH_TYPE=&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64-clang
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64
       )
  # - if /i %_CC%==MinGW (
  #     set VC_BUILD=false&&

From 55a820089912e7949bcd7ef5d8e786d55b3552d8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:44:24 +0200
Subject: [PATCH 11/54] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 99bd5a6..538af09 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
 environment:
   matrix:
   - _ARCH: arm64
-    _CC: MINGW
+    _CC: MinGW
  #   _CACHE: msys64
  #   _PLATFORM: android
 
@@ -52,7 +52,7 @@ build_script:
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
   - if /i %_CC%==MinGW (
      set VC_BUILD=false&&
-      set MSYS2_PATH_TYPE=&&
+ #     set MSYS2_PATH_TYPE=&&
       C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64
       )
  # - if /i %_CC%==MinGW (

From 7310b28fdb5641d63147e3b3ffec0c65ab84a943 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:45:08 +0200
Subject: [PATCH 12/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 538af09..2fb8ff7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
   - _ARCH: arm64
     _CC: MinGW
  #   _CACHE: msys64
- #   _PLATFORM: android
+    _PLATFORM: phone
 
 matrix:
   fast_finish: false

From 1593bfa9ffb79ed184648e639131fb6209c02973 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:47:08 +0200
Subject: [PATCH 13/54] Update appveyor.yml

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2fb8ff7..c2efcb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -52,9 +52,7 @@ build_script:
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
   - if /i %_CC%==MinGW (
      set VC_BUILD=false&&
- #     set MSYS2_PATH_TYPE=&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64
-      )
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64 )
  # - if /i %_CC%==MinGW (
  #     set VC_BUILD=false&&
  #     set MSYS2_PATH_TYPE=&&

From 2ae37c5a997652e200d8af08db180efde2e08fff Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:12:19 +0200
Subject: [PATCH 14/54] Update appveyor.yml

---
 appveyor.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c2efcb3..4e4ba6c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,6 @@ environment:
   matrix:
   - _ARCH: arm64
     _CC: MinGW
- #   _CACHE: msys64
-    _PLATFORM: phone
 
 matrix:
   fast_finish: false
@@ -20,7 +18,6 @@ init:
   - echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
   - set MSYS2_PATH_TYPE=inherit
   - set MSYS2_DIR=C:\msys64
-  - set
 
 #https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml
 
@@ -29,7 +26,7 @@ install:
   - git submodule update --init
   - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syyuu --noconfirm &&
-      C:\msys64\usr\bin\pacman -Suu --noconfirm   &&
+      C:\msys64\usr\bin\pacman -Suu --noconfirm &&
       C:\msys64\usr\bin\pacman -S --noconfirm --needed mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
       C:\msys64\usr\bin\pacman -Sc --noconfirm
     )
@@ -50,9 +47,7 @@ before_build:
 build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
-  - if /i %_CC%==MinGW (
-     set VC_BUILD=false&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64 )
+- ./avbuild.sh android arm64
  # - if /i %_CC%==MinGW (
  #     set VC_BUILD=false&&
  #     set MSYS2_PATH_TYPE=&&

From eb83423d423b7b1016fbb24c8dcb44576bd73604 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:18:39 +0200
Subject: [PATCH 15/54] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4e4ba6c..a9d5f33 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,8 +25,8 @@ install:
 # can not starts with %
   - git submodule update --init
   - if /i %_CC%==MinGW (
-      C:\msys64\usr\bin\pacman -Syyuu --noconfirm &&
-      C:\msys64\usr\bin\pacman -Suu --noconfirm &&
+      C:\msys64\usr\bin\pacman -Syu --noconfirm &&
+      C:\msys64\usr\bin\pacman -Su --noconfirm &&
       C:\msys64\usr\bin\pacman -S --noconfirm --needed mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
       C:\msys64\usr\bin\pacman -Sc --noconfirm
     )

From ef4245a98882d9462e0fe2dedcdf0611aa607c04 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:41:01 +0200
Subject: [PATCH 16/54] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a9d5f33..eeb260f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,10 +27,10 @@ install:
   - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&
-      C:\msys64\usr\bin\pacman -S --noconfirm --needed mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
+      C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
       C:\msys64\usr\bin\pacman -Sc --noconfirm
     )
-  - C:\msys64\usr\bin\pacman -S --noconfirm --needed diffutils patch pkg-config nasm yasm
+  - C:\msys64\usr\bin\pacman -S --noconfirm diffutils patch pkg-config nasm yasm
   - set FF_BRANCH=master
   - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
   - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_VERSION%

From c88e3d638a1ad1bad099705f68a7f4a112196416 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:45:17 +0200
Subject: [PATCH 17/54] Update appveyor.yml

---
 appveyor.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index eeb260f..49b6720 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,11 @@ init:
 
 install:
 # can not starts with %
-  - git submodule update --init
+- git submodule update --init
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
   - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&

From d4cf982bc8d4fff8d614c810448a1fceeb21d584 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:47:14 +0200
Subject: [PATCH 18/54] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 49b6720..f944961 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,8 +26,8 @@ install:
 - git submodule update --init
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- C:\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
   - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&

From 918e985213246a6c7ca3d26cc8b55b3a813a42b8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:52:03 +0200
Subject: [PATCH 19/54] Update appveyor.yml

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f944961..2790196 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,10 +24,10 @@ init:
 install:
 # can not starts with %
 - git submodule update --init
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- C:\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+#- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+#- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+#- C:\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+#- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
   - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&

From 153871ea3b091bcd60e01e78145fc747ef4e944d Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 04:55:51 +0200
Subject: [PATCH 20/54] Update appveyor.yml

---
 appveyor.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2790196..5d6debe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,7 @@ install:
 #- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 #- C:\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 #- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-  - if /i %_CC%==MinGW (
+- if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&
       C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
@@ -51,11 +51,11 @@ before_build:
 build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
-- ./avbuild.sh android arm64
- # - if /i %_CC%==MinGW (
- #     set VC_BUILD=false&&
- #     set MSYS2_PATH_TYPE=&&
- #     C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang arm64"
+# - ./avbuild.sh android arm64
+- if /i %_CC%==MinGW (
+      set VC_BUILD=false&&
+      set MSYS2_PATH_TYPE=&&
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang"
  #   ) else (
  #     set BUILD_NOW=true&&
  #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all

From ad4e8bc50167c63eee0c2a43bb5dc283e03ac0f6 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 05:24:01 +0200
Subject: [PATCH 21/54] Update appveyor.yml

---
 appveyor.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5d6debe..05213e0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,11 +7,12 @@ branches:
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
 environment:
   matrix:
-  - _ARCH: arm64
-    _CC: MinGW
-
-matrix:
-  fast_finish: false
+  - _ARCH: arm
+    _CC: MINGW
+    _PLATFORM: desktop 
+  
+  matrix: 
+    fast_finish: false
 
 init:
   - echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
@@ -34,13 +35,14 @@ install:
       C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
       C:\msys64\usr\bin\pacman -Sc --noconfirm
     )
-  - C:\msys64\usr\bin\pacman -S --noconfirm diffutils patch pkg-config nasm yasm
-  - set FF_BRANCH=master
-  - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
-  - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_VERSION%
-  - appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
+- C:\msys64\usr\bin\pacman -S --noconfirm diffutils patch pkg-config nasm yasm
+- set FF_BRANCH=master
+- if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
+- git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-master
+- if /i %_PLATFORM%==desktop (
+      appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
       7z x -y dep.7z -otools &&
-      set PKG_CONFIG_PATH_MFX=%CD%\tools\%_CC%%_ARCH%\lib\pkgconfig
+      set PKG_CONFIG_PATH_MFX=%CD%\tools\%_CC%%_ARCH%\lib\pkgconfig)
 
 before_build:
   - set HOME=%CD%

From ca1e4ce101841e68f3b7e82e928cc5b8d19c2805 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 05:26:44 +0200
Subject: [PATCH 22/54] Update appveyor.yml

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 05213e0..9d55cae 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,12 +7,12 @@ branches:
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
 environment:
   matrix:
-  - _ARCH: arm
+  - _ARCH: arm64
     _CC: MINGW
     _PLATFORM: desktop 
   
-  matrix: 
-    fast_finish: false
+matrix:
+  fast_finish: false
 
 init:
   - echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%

From b10e7ad832649c09204e9724d6f4a9eff8ceacfc Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 05:35:26 +0200
Subject: [PATCH 23/54] Update appveyor.yml

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9d55cae..80679cb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,9 +25,9 @@ init:
 install:
 # can not starts with %
 - git submodule update --init
-#- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-#- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-#- C:\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 #- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&

From c34a18b3dd5005215e0b7a2429cc96ad11475fc0 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 05:44:09 +0200
Subject: [PATCH 24/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 80679cb..74f5702 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,7 @@ install:
 - git submodule update --init
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 #- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&

From 0bdd7f997e5560fc9f1434b3f236245a93817be9 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:07:56 +0200
Subject: [PATCH 25/54] Update appveyor.yml

---
 appveyor.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 74f5702..03251b7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,19 @@ init:
 install:
 # can not starts with %
 - git submodule update --init
+# install latest pacman
+- bash 'pacman -Sy --noconfirm pacman pacman-mirrors'
+
+# update core packages
+- bash 'pacman -Syu --noconfirm'
+- bash 'pacman -Syu --noconfirm'
+ 
+ # install packages
+- bash 'pacman --sync --noconfirm VCS'
+- bash 'pacman --sync --noconfirm base-devel'
+- bash 'pacman --sync --noconfirm msys2-devel'
+- bash 'pacman --sync --noconfirm mingw-w64-x86_64-toolchain'
+
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
@@ -57,7 +70,7 @@ build_script:
 - if /i %_CC%==MinGW (
       set VC_BUILD=false&&
       set MSYS2_PATH_TYPE=&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android "arm64-clang"
+      C:\msys64\usr\bin\bash.exe --login avbuild.sh android
  #   ) else (
  #     set BUILD_NOW=true&&
  #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all

From e55f8c0f29205013fb41b7acbc175938f8102804 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:09:31 +0200
Subject: [PATCH 26/54] Update appveyor.yml

---
 appveyor.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 03251b7..bcd7144 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,17 +26,17 @@ install:
 # can not starts with %
 - git submodule update --init
 # install latest pacman
-- bash 'pacman -Sy --noconfirm pacman pacman-mirrors'
+- bash "pacman -Sy --noconfirm pacman pacman-mirrors"
 
 # update core packages
-- bash 'pacman -Syu --noconfirm'
-- bash 'pacman -Syu --noconfirm'
+- bash "pacman -Syu --noconfirm"
+- bash "pacman -Syu --noconfirm"
  
  # install packages
-- bash 'pacman --sync --noconfirm VCS'
-- bash 'pacman --sync --noconfirm base-devel'
-- bash 'pacman --sync --noconfirm msys2-devel'
-- bash 'pacman --sync --noconfirm mingw-w64-x86_64-toolchain'
+- bash "pacman --sync --noconfirm VCS"
+- bash "pacman --sync --noconfirm base-devel"
+- bash "pacman --sync --noconfirm msys2-devel"
+- bash "pacman --sync --noconfirm mingw-w64-x86_64-toolchain"
 
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig

From 64bb0a4246861363b60151f762284776e64b99d0 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:11:34 +0200
Subject: [PATCH 27/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index bcd7144..e312fee 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ install:
 # can not starts with %
 - git submodule update --init
 # install latest pacman
-- bash "pacman -Sy --noconfirm pacman pacman-mirrors"
+- pacman -Sy --noconfirm pacman pacman-mirrors
 
 # update core packages
 - bash "pacman -Syu --noconfirm"

From 076a2541adf76da1fde5a4e8a7bed94c657f5f32 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:13:07 +0200
Subject: [PATCH 28/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index e312fee..abf9e93 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ install:
 # can not starts with %
 - git submodule update --init
 # install latest pacman
-- pacman -Sy --noconfirm pacman pacman-mirrors
+C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
 
 # update core packages
 - bash "pacman -Syu --noconfirm"

From fbf0202c129b63731523849c262ece577491ec0b Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:14:24 +0200
Subject: [PATCH 29/54] Update appveyor.yml

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index abf9e93..59dde48 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,6 @@ install:
 # install latest pacman
 C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
 
-# update core packages
 - bash "pacman -Syu --noconfirm"
 - bash "pacman -Syu --noconfirm"
  

From bdf2b477088e59109b5dbea3a695325d2423eafb Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:15:23 +0200
Subject: [PATCH 30/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 59dde48..eb80b69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ install:
 # can not starts with %
 - git submodule update --init
 # install latest pacman
-C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
+- C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
 
 - bash "pacman -Syu --noconfirm"
 - bash "pacman -Syu --noconfirm"

From ff833337fb3cb024740ccc05138c1369d40fbcf8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:24:24 +0200
Subject: [PATCH 31/54] Update appveyor.yml

---
 appveyor.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index eb80b69..c71b126 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,11 @@ init:
 install:
 # can not starts with %
 - git submodule update --init
+
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+# - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- C:\msys64\usr\bin\pacman -U --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 # install latest pacman
 - C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
 
@@ -37,10 +42,6 @@ install:
 - bash "pacman --sync --noconfirm msys2-devel"
 - bash "pacman --sync --noconfirm mingw-w64-x86_64-toolchain"
 
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-#- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - if /i %_CC%==MinGW (
       C:\msys64\usr\bin\pacman -Syu --noconfirm &&
       C:\msys64\usr\bin\pacman -Su --noconfirm &&

From 84e0b0d0cb6d74bb83748f3c0f6b647b8b01d0ac Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:43:07 +0200
Subject: [PATCH 32/54] Update appveyor.yml

---
 appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c71b126..87384da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,7 +31,7 @@ install:
 # - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 - C:\msys64\usr\bin\pacman -U --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 # install latest pacman
-- C:\msys64\usr\bin\pacman -Sy --noconfirm pacman pacman-mirrors
+- C:\msys64\usr\bin\pacman -S --noconfirm pacman pacman-mirrors
 
 - bash "pacman -Syu --noconfirm"
 - bash "pacman -Syu --noconfirm"
@@ -69,7 +69,6 @@ build_script:
 # - ./avbuild.sh android arm64
 - if /i %_CC%==MinGW (
       set VC_BUILD=false&&
-      set MSYS2_PATH_TYPE=&&
       C:\msys64\usr\bin\bash.exe --login avbuild.sh android
  #   ) else (
  #     set BUILD_NOW=true&&

From 6602d70bfece3b05b8620d4bdb4059f24641b093 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:50:11 +0200
Subject: [PATCH 33/54] Update appveyor.yml

---
 appveyor.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 87384da..dd6825f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,26 +29,23 @@ install:
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 # - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- C:\msys64\usr\bin\pacman -U --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 # install latest pacman
 - C:\msys64\usr\bin\pacman -S --noconfirm pacman pacman-mirrors
 
-- bash "pacman -Syu --noconfirm"
-- bash "pacman -Syu --noconfirm"
+- C:\msys64\usr\bin\pacman -Syu --noconfirm
+- C:\msys64\usr\bin\pacman -Syu --noconfirm
  
  # install packages
-- bash "pacman --sync --noconfirm VCS"
-- bash "pacman --sync --noconfirm base-devel"
-- bash "pacman --sync --noconfirm msys2-devel"
-- bash "pacman --sync --noconfirm mingw-w64-x86_64-toolchain"
+- C:\msys64\usr\bin\pacman --sync --noconfirm VCS
+- C:\msys64\usr\bin\pacman --sync --noconfirm base-devel
+- C:\msys64\usr\bin\pacman --sync --noconfirm msys2-devel
+- C:\msys64\usr\bin\pacman --sync --noconfirm mingw-w64-x86_64-toolchain
 
-- if /i %_CC%==MinGW (
-      C:\msys64\usr\bin\pacman -Syu --noconfirm &&
-      C:\msys64\usr\bin\pacman -Su --noconfirm &&
-      C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc &&
-      C:\msys64\usr\bin\pacman -Sc --noconfirm
-    )
-- C:\msys64\usr\bin\pacman -S --noconfirm diffutils patch pkg-config nasm yasm
+- C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc
+- C:\msys64\usr\bin\pacman -Sc --noconfirm
+ 
+- C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
 - set FF_BRANCH=master
 - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
 - git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-master

From f0765dc6e6559390d5e0b0de2d9dcdbb861babf8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 06:51:56 +0200
Subject: [PATCH 34/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index dd6825f..4ba24ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@ install:
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
 # - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- C:\msys64\usr\bin\pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 # install latest pacman
 - C:\msys64\usr\bin\pacman -S --noconfirm pacman pacman-mirrors
 

From a434ce81f7a067ab4416013449ddcb639bbabdae Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:10:06 +0200
Subject: [PATCH 35/54] Update appveyor.yml

---
 appveyor.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4ba24ce..06d62cd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,10 +9,14 @@ environment:
   matrix:
   - _ARCH: arm64
     _CC: MINGW
-    _PLATFORM: desktop 
+    _PLATFORM: desktop
+    _CACHE: msys64
   
 matrix:
   fast_finish: false
+  
+cache:
+  - C:\%_CACHE%\var\cache\pacman\pkg -> appveyor.yml
 
 init:
   - echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
@@ -26,19 +30,20 @@ install:
 # can not starts with %
 - git submodule update --init
 
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-# - sh pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-- C:\msys64\usr\bin\pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+# - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+# - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+# - C:\msys64\usr\bin\bash.exe pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
 # install latest pacman
-- C:\msys64\usr\bin\pacman -S --noconfirm pacman pacman-mirrors
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 
-- C:\msys64\usr\bin\pacman -Syu --noconfirm
-- C:\msys64\usr\bin\pacman -Syu --noconfirm
+- C:\msys64\usr\bin\pacman -Su --noconfirm
+- C:\msys64\usr\bin\pacman -Su --noconfirm
  
  # install packages
 - C:\msys64\usr\bin\pacman --sync --noconfirm VCS
-- C:\msys64\usr\bin\pacman --sync --noconfirm base-devel
+- C:\msys64\usr\bin\pacman --sync --noconfirm http://repo.msys2.org/distrib/msys2-x86_64-latest.tar.xz
 - C:\msys64\usr\bin\pacman --sync --noconfirm msys2-devel
 - C:\msys64\usr\bin\pacman --sync --noconfirm mingw-w64-x86_64-toolchain
 

From 94cb4e786947969dd8ecdefd652a9dd4d282eaa9 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:34:27 +0200
Subject: [PATCH 36/54] Update appveyor.yml

---
 appveyor.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 06d62cd..76bc90f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,17 +37,20 @@ install:
 # install latest pacman
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
 
-- C:\msys64\usr\bin\pacman -Su --noconfirm
-- C:\msys64\usr\bin\pacman -Su --noconfirm
+- C:\msys64\usr\bin\pacman -Syu --noconfirm
+- C:\msys64\usr\bin\pacman -Syu --noconfirm
  
  # install packages
 - C:\msys64\usr\bin\pacman --sync --noconfirm VCS
-- C:\msys64\usr\bin\pacman --sync --noconfirm http://repo.msys2.org/distrib/msys2-x86_64-latest.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20200720.tar.xz
+
 - C:\msys64\usr\bin\pacman --sync --noconfirm msys2-devel
 - C:\msys64\usr\bin\pacman --sync --noconfirm mingw-w64-x86_64-toolchain
 
-- C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-gcc mingw-w64-x86_64-gcc
+- C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-gcc
 - C:\msys64\usr\bin\pacman -Sc --noconfirm
  
 - C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm

From ebb82e780e62cba394df7271242c28582ec80ecf Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:47:55 +0200
Subject: [PATCH 37/54] Update appveyor.yml

---
 appveyor.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 76bc90f..9fba4bb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,15 +37,18 @@ install:
 # install latest pacman
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
-# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20200720.tar.xz
+
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
+# http://repo.msys2.org/mingw/x86_64/mingw64.db
+# http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
 
-- C:\msys64\usr\bin\pacman -Syu --noconfirm
-- C:\msys64\usr\bin\pacman -Syu --noconfirm
+# - C:\msys64\usr\bin\pacman -Syu --noconfirm
+# - C:\msys64\usr\bin\pacman -Syu --noconfirm
  
  # install packages
 - C:\msys64\usr\bin\pacman --sync --noconfirm VCS
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20200720.tar.xz
 
 - C:\msys64\usr\bin\pacman --sync --noconfirm msys2-devel
 - C:\msys64\usr\bin\pacman --sync --noconfirm mingw-w64-x86_64-toolchain

From 3cc8bfe54e04789a34dc1c83e4e71b1fedb3180d Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:53:14 +0200
Subject: [PATCH 38/54] Update appveyor.yml

---
 appveyor.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9fba4bb..a3b426c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,11 +38,10 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20200720.tar.xz
-
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
+
 # http://repo.msys2.org/mingw/x86_64/mingw64.db
-# http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
 
 # - C:\msys64\usr\bin\pacman -Syu --noconfirm
 # - C:\msys64\usr\bin\pacman -Syu --noconfirm

From 1a61c75ff29c9aa806e40a4ee115a58aea3d3d2a Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 09:15:53 +0200
Subject: [PATCH 39/54] Update appveyor.yml

---
 appveyor.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a3b426c..43b8dbd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,10 +38,12 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
+- C:\msys64\usr\bin\pacman -U --noconfirm https://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.6-3-x86_64.pkg.tar.xz
 
-# http://repo.msys2.org/mingw/x86_64/mingw64.db
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
+
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
 
 # - C:\msys64\usr\bin\pacman -Syu --noconfirm
 # - C:\msys64\usr\bin\pacman -Syu --noconfirm

From 918785e5e3ef34d240c38ed7df9c52c8d8206436 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 09:33:24 +0200
Subject: [PATCH 40/54] Update appveyor.yml

---
 appveyor.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 43b8dbd..f2bf749 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,10 +39,12 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
-- C:\msys64\usr\bin\pacman -U --noconfirm https://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.6-3-x86_64.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
 
 
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
 
 # - C:\msys64\usr\bin\pacman -Syu --noconfirm

From 05673d06cf18eabd4248589a9d4934ceee89a680 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 09:35:10 +0200
Subject: [PATCH 41/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f2bf749..3cbfa32 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,7 +39,7 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
 

From d37296956dbdacba3b43edc5222439ab67c9323e Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 09:51:57 +0200
Subject: [PATCH 42/54] Update appveyor.yml

---
 appveyor.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3cbfa32..460ba6a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ branches:
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
 environment:
   matrix:
-  - _ARCH: arm64
+  - _ARCH: arm
     _CC: MINGW
     _PLATFORM: desktop
     _CACHE: msys64
@@ -60,9 +60,11 @@ install:
 - C:\msys64\usr\bin\pacman -Sc --noconfirm
  
 - C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
-- set FF_BRANCH=master
+
+- set %FF_VERSION%=master
+- set FF_BRANCH=%FF_VERSION%
 - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
-- git clone -b %FF_BRANCH% --depth 1 --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-master
+- git clone -b %FF_BRANCH% --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_BRANCH%
 - if /i %_PLATFORM%==desktop (
       appveyor DownloadFile "https://sourceforge.net/projects/avbuild/files/dep/dep.7z/download" -FileName dep.7z &&
       7z x -y dep.7z -otools &&

From fa5b0eb7ffbf61018603bddf1c782aefe3dd70e8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 10:17:03 +0200
Subject: [PATCH 43/54] Update appveyor.yml

---
 appveyor.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 460ba6a..243255a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,21 +47,20 @@ install:
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db.tar.gz
 
-# - C:\msys64\usr\bin\pacman -Syu --noconfirm
-# - C:\msys64\usr\bin\pacman -Syu --noconfirm
+- C:\msys64\usr\bin\pacman -Su --noconfirm
+- C:\msys64\usr\bin\pacman -Su --noconfirm
  
  # install packages
 - C:\msys64\usr\bin\pacman --sync --noconfirm VCS
 
-- C:\msys64\usr\bin\pacman --sync --noconfirm msys2-devel
-- C:\msys64\usr\bin\pacman --sync --noconfirm mingw-w64-x86_64-toolchain
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed msys2-devel
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed mingw-w64-x86_64-toolchain
 
-- C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-gcc
-- C:\msys64\usr\bin\pacman -Sc --noconfirm
- 
-- C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed mingw-w64-x86_64-gcc
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed diffutils patch pkg-config nasm yasm
+- C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- set %FF_VERSION%=master
+- set FF_VERSION=master
 - set FF_BRANCH=%FF_VERSION%
 - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%
 - git clone -b %FF_BRANCH% --no-tags https://git.ffmpeg.org/ffmpeg.git ffmpeg-%FF_BRANCH%
@@ -80,16 +79,14 @@ build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
 # - ./avbuild.sh android arm64
-- if /i %_CC%==MinGW (
-      set VC_BUILD=false&&
-      C:\msys64\usr\bin\bash.exe --login avbuild.sh android
+- C:\msys64\usr\bin\bash --login avbuild.sh android arm64
  #   ) else (
  #     set BUILD_NOW=true&&
  #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all
  #   )
 
 after_build:
-  - set SDK_NAME=ffmpeg-%FF_VERSION%-%_PLATFORM%-%_CC%%_ARCH%%CONFIG_SUFFIX%
+  - set SDK_NAME=ffmpeg-%FF_VERSION%-%_PLATFORM%-%_CC%%_ARCH%
   - move sdk* %SDK_NAME%
   - 7z a %SDK_NAME%.7z %SDK_NAME%
 

From 2722e98bd3f4cb465c43a8dd5ceed6e7cc466f41 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:25:02 +0200
Subject: [PATCH 44/54] Update appveyor.yml

---
 appveyor.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 243255a..864eb84 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,9 +7,9 @@ branches:
 # APPVEYOR_BUILD_WORKER_IMAGE is used in environment matrix, image is not
 environment:
   matrix:
-  - _ARCH: arm
+  - _ARCH: arm64
     _CC: MINGW
-    _PLATFORM: desktop
+    _PLATFORM:phone
     _CACHE: msys64
   
 matrix:
@@ -23,6 +23,7 @@ init:
   - echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
   - set MSYS2_PATH_TYPE=inherit
   - set MSYS2_DIR=C:\msys64
+  - set USE_TOOLCHAIN=gcc
 
 #https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml
 
@@ -38,8 +39,8 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
-# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz
-# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz 
+- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
 
@@ -53,11 +54,11 @@ install:
  # install packages
 - C:\msys64\usr\bin\pacman --sync --noconfirm VCS
 
-- C:\msys64\usr\bin\pacman -Su --noconfirm --needed msys2-devel
-- C:\msys64\usr\bin\pacman -Su --noconfirm --needed mingw-w64-x86_64-toolchain
+- C:\msys64\usr\bin\pacman -Su --noconfirm msys2-devel
+- C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-toolchain
 
-- C:\msys64\usr\bin\pacman -Su --noconfirm --needed mingw-w64-x86_64-gcc
-- C:\msys64\usr\bin\pacman -Su --noconfirm --needed diffutils patch pkg-config nasm yasm
+- C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-gcc
+- C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
 - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
 - set FF_VERSION=master
@@ -79,7 +80,8 @@ build_script:
 # V=1 to check libmfx error, but the error disappears if V=1. WTF
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
 # - ./avbuild.sh android arm64
-- C:\msys64\usr\bin\bash --login avbuild.sh android arm64
+- set VC_BUILD=false
+- C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64-gcc
  #   ) else (
  #     set BUILD_NOW=true&&
  #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all

From e58e403770184d67d37fedd86f85295c078d0870 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:36:02 +0200
Subject: [PATCH 45/54] Update appveyor.yml

---
 appveyor.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 864eb84..f79a36b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
   matrix:
   - _ARCH: arm64
     _CC: MINGW
-    _PLATFORM:phone
+    _PLATFORM: phone
     _CACHE: msys64
   
 matrix:
@@ -61,6 +61,11 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
 - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
+- wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
+- 7z x ndk.zip -o/tmp &>/dev/null
+- mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
+- set ANDROID_NDK=/tmp/android-ndk
+
 - set FF_VERSION=master
 - set FF_BRANCH=%FF_VERSION%
 - if not [%FF_BRANCH%]==[master] set FF_BRANCH=release/%FF_VERSION%

From b648b5bde39537f73b804f13cd784c979db83f4c Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:37:21 +0200
Subject: [PATCH 46/54] Update appveyor.yml

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f79a36b..c20800d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,6 @@ install:
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz 
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pkgconf-0.9.11-1-x86_64.pkg.tar.zst
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
 

From d2e107509f86e8fcac498893ac0a07b020992fe8 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:48:29 +0200
Subject: [PATCH 47/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c20800d..bc24ea4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -57,7 +57,7 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-toolchain
 
 - C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-gcc
-- C:\msys64\usr\bin\pacman -Su --noconfirm diffutils patch pkg-config nasm yasm
+- C:\msys64\usr\bin\pacman -Su --noconfirm  wget diffutils patch pkg-config nasm yasm
 - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
 - wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip

From 6840859080012ce9f8faf8b37f30305cd00b06c9 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:57:26 +0200
Subject: [PATCH 48/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index bc24ea4..28fccd9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,7 +60,7 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm  wget diffutils patch pkg-config nasm yasm
 - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
+- C:\msys64\usr\bin\bash.exewget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
 - 7z x ndk.zip -o/tmp &>/dev/null
 - mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
 - set ANDROID_NDK=/tmp/android-ndk

From 2c5c6106558b32b399cc291404dc744d733ae2a6 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:00:50 +0200
Subject: [PATCH 49/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 28fccd9..e454eaa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,7 +60,7 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm  wget diffutils patch pkg-config nasm yasm
 - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- C:\msys64\usr\bin\bash.exewget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
+- C:\msys64\usr\bin\bash.exe wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
 - 7z x ndk.zip -o/tmp &>/dev/null
 - mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
 - set ANDROID_NDK=/tmp/android-ndk

From e38267dbb2da85edd3b8434b1f3959e89b3bb6e3 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:24:56 +0200
Subject: [PATCH 50/54] Update appveyor.yml

---
 appveyor.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e454eaa..e4f1f6d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,10 +38,10 @@ install:
 # install latest pacman
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-5.2.2-1-x86_64.pkg.tar.xz
 - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/pacman-mirrors-20200329-1-any.pkg.tar.xz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-db-6.0.19-3-any.pkg.tar.xz
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/msys.db.tar.gz 
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
-- C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/gnupg-2.2.20-1-x86_64.pkg.tar.xz
+# - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/msys/x86_64/libgpgme-1.14.0-1-x86_64.pkg.tar.zst
 
 
 # - C:\msys64\usr\bin\pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw64.db
@@ -51,16 +51,14 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm
  
  # install packages
-- C:\msys64\usr\bin\pacman --sync --noconfirm VCS
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed VCS
 
-- C:\msys64\usr\bin\pacman -Su --noconfirm msys2-devel
-- C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-toolchain
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed base-devel mingw-w64-x86_64-toolchain mingw-w64-cross-toolchain
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed mingw-w64-x86_64-clang
+- C:\msys64\usr\bin\pacman -Su --noconfirm --needed wget diffutils patch pkg-config nasm yasm
+# - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- C:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-x86_64-gcc
-- C:\msys64\usr\bin\pacman -Su --noconfirm  wget diffutils patch pkg-config nasm yasm
-- C:\msys64\usr\bin\pacman -Scc --noconfirm
-
-- C:\msys64\usr\bin\bash.exe wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
+- C:\msys64\usr\bin\wget.exe https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
 - 7z x ndk.zip -o/tmp &>/dev/null
 - mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
 - set ANDROID_NDK=/tmp/android-ndk

From 54b1d3a16b832adcd30e3e1de4c5ebf7d0d4958f Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:37:06 +0200
Subject: [PATCH 51/54] Update appveyor.yml

---
 appveyor.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e4f1f6d..a80601b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,8 +23,9 @@ init:
   - echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
   - set MSYS2_PATH_TYPE=inherit
   - set MSYS2_DIR=C:\msys64
-  - set USE_TOOLCHAIN=gcc
-
+  - set USE_TOOLCHAIN=clang
+  - set NDK_HOST=windows
+  - set NDK_VERSION=r21d
 #https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml
 
 install:
@@ -58,7 +59,7 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm --needed wget diffutils patch pkg-config nasm yasm
 # - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- C:\msys64\usr\bin\wget.exe https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r21}-${NDK_HOST}-x86_64.zip -O ndk.zip
+- C:\msys64\usr\bin\wget.exe https://dl.google.com/android/repository/android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -O ndk.zip
 - 7z x ndk.zip -o/tmp &>/dev/null
 - mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
 - set ANDROID_NDK=/tmp/android-ndk
@@ -83,7 +84,7 @@ build_script:
 #  - if /i not %_CC%==MinGW if /i not %_PLATFORM%==store set V=1
 # - ./avbuild.sh android arm64
 - set VC_BUILD=false
-- C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64-gcc
+- C:\msys64\usr\bin\bash.exe --login avbuild.sh android arm64
  #   ) else (
  #     set BUILD_NOW=true&&
  #     tools\vcbuild.bat %_CC% %_PLATFORM% %_ARCH% all

From 44de063eada97d9488ccac994469dd4b7633006c Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:50:00 +0200
Subject: [PATCH 52/54] Update appveyor.yml

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a80601b..2280f10 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
   matrix:
   - _ARCH: arm64
     _CC: MINGW
-    _PLATFORM: phone
+    _PLATFORM: desktop
     _CACHE: msys64
   
 matrix:
@@ -59,9 +59,9 @@ install:
 - C:\msys64\usr\bin\pacman -Su --noconfirm --needed wget diffutils patch pkg-config nasm yasm
 # - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
-- C:\msys64\usr\bin\wget.exe https://dl.google.com/android/repository/android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -O ndk.zip
-- 7z x ndk.zip -o/tmp &>/dev/null
-- mv /tmp/android-ndk-${NDK_VERSION:-r21} ${ANDROID_NDK:-/tmp/android-ndk}
+- curl -O http://dl.google.com/android/repository/android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip
+- 7z x android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -o /tmp
+- mv /tmp/android-ndk-%NDK_VERSION% /tmp/android-ndk
 - set ANDROID_NDK=/tmp/android-ndk
 
 - set FF_VERSION=master

From e08a320c9bd7834b5d68e02657ac684bd3630d01 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:53:37 +0200
Subject: [PATCH 53/54] Update appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2280f10..5d0fa7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,7 +60,7 @@ install:
 # - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
 - curl -O http://dl.google.com/android/repository/android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip
-- 7z x android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -o /tmp
+- 7z x -y android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -o/tmp
 - mv /tmp/android-ndk-%NDK_VERSION% /tmp/android-ndk
 - set ANDROID_NDK=/tmp/android-ndk
 

From c7c7922c2f0bc5b5880e71b7e4ef49f868805c63 Mon Sep 17 00:00:00 2001
From: gtskhadadze83 <53004769+gtskhadadze83@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:07:19 +0200
Subject: [PATCH 54/54] Update appveyor.yml

---
 appveyor.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5d0fa7d..389fb3b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,9 +60,8 @@ install:
 # - C:\msys64\usr\bin\pacman -Scc --noconfirm
 
 - curl -O http://dl.google.com/android/repository/android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip
-- 7z x -y android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -o/tmp
-- mv /tmp/android-ndk-%NDK_VERSION% /tmp/android-ndk
-- set ANDROID_NDK=/tmp/android-ndk
+- 7z x -y android-ndk-%NDK_VERSION%-%NDK_HOST%-x86_64.zip -oandroid-ndk
+- set ANDROID_NDK=%CD%\android-ndk
 
 - set FF_VERSION=master
 - set FF_BRANCH=%FF_VERSION%