From a768b652958b03f132dea8ba576f61e7931d65b3 Mon Sep 17 00:00:00 2001
From: zurg3 <20664125+zurg3@users.noreply.github.com>
Date: Mon, 9 Nov 2020 22:44:11 +0300
Subject: [PATCH] Updated FFmpeg version in GitHub Actions workflows

---
 .github/workflows/linux.yml |  2 +-
 .github/workflows/mac.yml   | 10 ++++++----
 .github/workflows/win.yml   |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d71ca2a62d..fdb5c5ca06 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -229,7 +229,7 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone --branch release/3.4 $GIT/FFmpeg/FFmpeg ffmpeg
+          git clone --branch release/4.2 $GIT/FFmpeg/FFmpeg ffmpeg
           cd ffmpeg
           ./configure \
           --disable-debug \
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index fe1c08bea4..26a625dca8 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -235,7 +235,7 @@ jobs:
 
           git clone $GIT/FFmpeg/FFmpeg.git ffmpeg
           cd ffmpeg
-          git checkout release/3.4
+          git checkout release/4.2
           CFLAGS=`freetype-config --cflags`
           LDFLAGS=`freetype-config --libs`
           PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@@ -244,7 +244,9 @@ jobs:
           --extra-cflags="$MIN_MAC $UNGUARDED" \
           --extra-cxxflags="$MIN_MAC $UNGUARDED" \
           --extra-ldflags="$MIN_MAC" \
-          --enable-protocol=file --enable-libopus \
+          --x86asmexe=`pwd`/macos_yasm_wrap.sh \
+          --enable-protocol=file \
+          --enable-libopus \
           --disable-programs \
           --disable-doc \
           --disable-network \
@@ -364,9 +366,9 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/kcat/openal-soft.git
+          git clone https://github.com/telegramdesktop/openal-soft.git
           cd openal-soft
-          git checkout openal-soft-1.19.1
+          git checkout fix_mono
           cd build
 
           CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake \
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 6f3d1d6ce0..510ce788eb 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -294,10 +294,10 @@ jobs:
 
           git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg
           cd ffmpeg
-          git checkout release/3.4
+          git checkout release/4.2
           set CHERE_INVOKING=enabled_from_arguments
           set MSYS2_PATH_TYPE=inherit
-          call c:\tools\msys64\usr\bin\bash --login ../../%REPO_NAME%/Telegram/Patches/build_ffmpeg_win.sh
+          call c:\tools\msys64\usr\bin\bash --login ../patches/build_ffmpeg_win.sh
 
           rmdir /S /Q .git