From 9778a319bed1521c100a03efc7021536969e1892 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 4 Feb 2020 21:05:45 -0800
Subject: [PATCH] Switch to pre-patched FFmpeg 4.2 with NVMPI support

---
 FFmpeg                | 2 +-
 scripts/build-deps.sh | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/FFmpeg b/FFmpeg
index 747429e..9da2b95 160000
--- a/FFmpeg
+++ b/FFmpeg
@@ -1 +1 @@
-Subproject commit 747429ea1cf561d5f375980eb1a731491d4fce87
+Subproject commit 9da2b95b8094e2b1f9d960760edca7e3c4059616
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index 467f240..7fa0487 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -24,10 +24,6 @@ elif [ "$ARCH" == "aarch64" ]; then
     make -j$(nproc)
     make install
 
-    # We need to patch ffmpeg to add NVMPI support
-    cd /opt/FFmpeg
-    git apply /opt/jetson-ffmpeg/ffmpeg_nvmpi.patch
-
     # Enable NVMPI decoders
     EXTRA_FFMPEG_ARGS="--enable-nvmpi --enable-decoder=h264_nvmpi --enable-decoder=hevc_nvmpi"
 elif [ "$ARCH" == "x86_64" ]; then
@@ -44,4 +40,4 @@ fi
 cd /opt/FFmpeg
 ./configure $BASE_FFMPEG_ARGS $EXTRA_FFMPEG_ARGS
 make -j$(nproc)
-make install
\ No newline at end of file
+make install