From 47e36e6aeeff5148a7a1b23625e7649095fad3c4 Mon Sep 17 00:00:00 2001
From: Joel Linn <jl@conductive.de>
Date: Fri, 19 Jun 2020 22:32:40 +0200
Subject: [PATCH] Exchange libav with ffmpeg submodule.

---
 .gitmodules           | 6 +++---
 premake5.lua          | 2 +-
 third_party/FFmpeg    | 1 +
 third_party/libav     | 1 -
 third_party/libav.lua | 3 ---
 5 files changed, 5 insertions(+), 8 deletions(-)
 create mode 160000 third_party/FFmpeg
 delete mode 160000 third_party/libav
 delete mode 100644 third_party/libav.lua

diff --git a/.gitmodules b/.gitmodules
index 4de38bcd8..35b49aab7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "third_party/binutils-ppc-cygwin"]
 	path = third_party/binutils-ppc-cygwin
 	url = https://github.com/benvanik/binutils-ppc-cygwin.git
-[submodule "third_party/libav"]
-	path = third_party/libav
-	url = https://github.com/xenia-project/libav.git
 [submodule "third_party/spirv-tools"]
 	path = third_party/spirv-tools
 	url = https://github.com/xenia-project/SPIRV-Tools.git
@@ -76,3 +73,6 @@
 [submodule "third_party/xxhash"]
 	path = third_party/xxhash
 	url = https://github.com/Cyan4973/xxHash.git
+[submodule "third_party/FFmpeg"]
+	path = third_party/FFmpeg
+	url = https://github.com/xenia-project/FFmpeg.git
diff --git a/premake5.lua b/premake5.lua
index fd436d356..8d35f25c2 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -230,10 +230,10 @@ solution("xenia")
   include("third_party/discord-rpc.lua")
   include("third_party/cxxopts.lua")
   include("third_party/cpptoml.lua")
+  include("third_party/FFmpeg/premake5.lua")
   include("third_party/fmt.lua")
   include("third_party/glslang-spirv.lua")
   include("third_party/imgui.lua")
-  include("third_party/libav.lua")
   include("third_party/mspack.lua")
   include("third_party/snappy.lua")
   include("third_party/spirv-tools.lua")
diff --git a/third_party/FFmpeg b/third_party/FFmpeg
new file mode 160000
index 000000000..3bdf3805f
--- /dev/null
+++ b/third_party/FFmpeg
@@ -0,0 +1 @@
+Subproject commit 3bdf3805fcd978e0226ccbb36340784fec8cb251
diff --git a/third_party/libav b/third_party/libav
deleted file mode 160000
index decf5693f..000000000
--- a/third_party/libav
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit decf5693f5d13625f2678b210df2bced5ca0b6be
diff --git a/third_party/libav.lua b/third_party/libav.lua
deleted file mode 100644
index 122a70cc8..000000000
--- a/third_party/libav.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-group("third_party")
-  include("libav/libavcodec/premake5.lua")
-  include("libav/libavutil/premake5.lua")