From fc21a63a1dfbc3ba145565d7c4ec464224cf932c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 23 Aug 2024 04:50:08 +0000
Subject: [PATCH] Update FFmpeg for L4T platforms

---
 .gitmodules           | 2 +-
 FFmpeg-l4t            | 2 +-
 FFmpeg-l4t-new        | 2 +-
 scripts/build-deps.sh | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9d729f2..09ad6fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
 	url = https://github.com/cgutman/userland.git
 [submodule "FFmpeg-l4t"]
 	path = FFmpeg-l4t
-	url = https://gitlab.com/switchroot/switch-l4t-multimedia/FFmpeg.git
+	url = https://github.com/cgutman/FFmpeg.git
 [submodule "dav1d"]
 	path = dav1d
 	url = https://code.videolan.org/videolan/dav1d.git
diff --git a/FFmpeg-l4t b/FFmpeg-l4t
index 91e53cd..e119ff5 160000
--- a/FFmpeg-l4t
+++ b/FFmpeg-l4t
@@ -1 +1 @@
-Subproject commit 91e53cd8349f6a6a74ef7bc9498052467345cff4
+Subproject commit e119ff5f25d4fa431792643b8d7754ce152fbae2
diff --git a/FFmpeg-l4t-new b/FFmpeg-l4t-new
index ac6ab5a..93133c0 160000
--- a/FFmpeg-l4t-new
+++ b/FFmpeg-l4t-new
@@ -1 +1 @@
-Subproject commit ac6ab5a6decc38b6149c9a77fd574008debe7377
+Subproject commit 93133c040cff97b99046612dac7219844a55f3b8
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index c6f0d69..ebb9e8f 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -82,9 +82,3 @@ cd /opt/FFmpeg
 ./configure $BASE_FFMPEG_ARGS $EXTRA_FFMPEG_ARGS $DAV1D_FFMPEG_ARGS
 make -j$(nproc)
 make install
-
-if [ "$TARGET" == "l4t" ]; then
-    # Patch libavcodec.pc to provide the proper library path for libnvbuf_utils.so
-    sed -i 's|-lnvbuf_utils|-L/usr/lib/aarch64-linux-gnu/tegra -Wl,-rpath=/usr/lib/aarch64-linux-gnu/tegra -lnvbuf_utils|g' /usr/local/lib/pkgconfig/libavcodec.pc
-    cat /usr/local/lib/pkgconfig/libavcodec.pc
-fi