From cb80ae2d373a9674ccbb17bff327961d50276179 Mon Sep 17 00:00:00 2001
From: Ahmad Sharif <ahmads@fb.com>
Date: Mon, 23 Sep 2024 11:41:04 -0700
Subject: [PATCH 1/3] Added swscale to build job

---
 .github/workflows/build_ffmpeg.yaml | 10 ++++++++--
 packaging/build_ffmpeg.sh           | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_ffmpeg.yaml b/.github/workflows/build_ffmpeg.yaml
index ce9fa2af..e75d8672 100644
--- a/.github/workflows/build_ffmpeg.yaml
+++ b/.github/workflows/build_ffmpeg.yaml
@@ -10,9 +10,15 @@
 name: Build non-GPL FFmpeg from source
 
 on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+    tags:
+        - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
   workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 0'  # on sunday
 
 defaults:
   run:
diff --git a/packaging/build_ffmpeg.sh b/packaging/build_ffmpeg.sh
index 0a7c0716..d28f515b 100755
--- a/packaging/build_ffmpeg.sh
+++ b/packaging/build_ffmpeg.sh
@@ -76,24 +76,28 @@ if [[ "$(uname)" == Darwin ]]; then
         avformat=libavformat.58
         avdevice=libavdevice.58
         avfilter=libavfilter.7
+        swscale=libswscale.5
     elif [[ ${major_ver} == 5 ]]; then
         avutil=libavutil.57
         avcodec=libavcodec.59
         avformat=libavformat.59
         avdevice=libavdevice.59
         avfilter=libavfilter.8
+        swscale=libswscale.6
     elif [[ ${major_ver} == 6 ]]; then
         avutil=libavutil.58
         avcodec=libavcodec.60
         avformat=libavformat.60
         avdevice=libavdevice.60
         avfilter=libavfilter.9
+        swscale=libswscale.7
     elif [[ ${major_ver} == 7 ]]; then
         avutil=libavutil.59
         avcodec=libavcodec.61
         avformat=libavformat.61
         avdevice=libavdevice.61
         avfilter=libavfilter.10
+        swscale=libswscale.8
     else
         printf "Error: unexpected FFmpeg major version: %s\n"  ${major_ver}
         exit 1;
@@ -115,7 +119,7 @@ if [[ "$(uname)" == Darwin ]]; then
     fi
 
     # list up the paths to fix
-    for lib in ${avcodec} ${avdevice} ${avfilter} ${avformat} ${avutil}; do
+    for lib in ${avcodec} ${avdevice} ${avfilter} ${avformat} ${avutil} ${swscale}; do
         ${otool} -l ${prefix}/lib/${lib}.dylib | grep -B2 ${prefix}
     done
 
@@ -143,6 +147,13 @@ if [[ "$(uname)" == Darwin ]]; then
         ${prefix}/lib/${avfilter}.dylib
     ${otool} -l ${prefix}/lib/${avfilter}.dylib | grep -B2 ${prefix}
 
+    ${install_name_tool} \
+        -change ${prefix}/lib/${avutil}.dylib @rpath/${avutil}.dylib \
+        -delete_rpath ${prefix}/lib \
+        -id @rpath/${swscale}.dylib \
+        ${prefix}/lib/${swscale}.dylib
+    ${otool} -l ${prefix}/lib/${swscale}.dylib | grep -B2 ${prefix}
+
     ${install_name_tool} \
         -change ${prefix}/lib/${avcodec}.dylib @rpath/${avcodec}.dylib \
         -change ${prefix}/lib/${avutil}.dylib @rpath/${avutil}.dylib \

From 983b694466c860c939aada86c6c7f044327078a1 Mon Sep 17 00:00:00 2001
From: Ahmad Sharif <ahmads@fb.com>
Date: Mon, 23 Sep 2024 11:52:18 -0700
Subject: [PATCH 2/3] .

---
 packaging/build_ffmpeg.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/build_ffmpeg.sh b/packaging/build_ffmpeg.sh
index d28f515b..c5d28437 100755
--- a/packaging/build_ffmpeg.sh
+++ b/packaging/build_ffmpeg.sh
@@ -60,7 +60,8 @@ tar -xf ffmpeg.tar.gz --strip-components 1
     --enable-avdevice \
     --enable-avfilter \
     --enable-avformat \
-    --enable-avutil
+    --enable-avutil \
+    --enable-swscale
 
 make -j install
 ls ${prefix}/*

From f819a6569b606dc361eb5cd7d50ff9a279528476 Mon Sep 17 00:00:00 2001
From: Ahmad Sharif <ahmads@fb.com>
Date: Mon, 23 Sep 2024 14:24:36 -0700
Subject: [PATCH 3/3] .

---
 .github/workflows/build_ffmpeg.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_ffmpeg.yaml b/.github/workflows/build_ffmpeg.yaml
index e75d8672..ce9fa2af 100644
--- a/.github/workflows/build_ffmpeg.yaml
+++ b/.github/workflows/build_ffmpeg.yaml
@@ -10,15 +10,9 @@
 name: Build non-GPL FFmpeg from source
 
 on:
-  pull_request:
-  push:
-    branches:
-      - nightly
-      - main
-      - release/*
-    tags:
-        - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'  # on sunday
 
 defaults:
   run: