From 0a54e34a9bbb2869c6e6b577487b99e26defad50 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 8 Sep 2024 19:37:35 +0200 Subject: [PATCH] Update FFMPEG to properly rebased branch The prior FFMPEG merge was not properly rebased to Vita3K master. I created a backup branch arm64_old on the current commit. I reset master to vita3k master and cherry picked our 5 commits. Then I squashed the last 2 commits because one of them was obsolete. --- 3rdparty/ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/ffmpeg b/3rdparty/ffmpeg index ad755301a1..ec6367d3ba 160000 --- a/3rdparty/ffmpeg +++ b/3rdparty/ffmpeg @@ -1 +1 @@ -Subproject commit ad755301a1c74d95819dc4bd5ce036a40e051e17 +Subproject commit ec6367d3ba9d0d57b9d22d4b87da8144acaf428f