From e7b46afa9d8919c7d701fc956a3e215b02b75ad8 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 29 Aug 2015 21:04:26 -0700
Subject: [PATCH] Fixing build and removing old binary libav submodule.

---
 .gitmodules                  | 3 ---
 src/xenia/apu/premake5.lua   | 2 +-
 src/xenia/apu/xma_context.cc | 6 +++---
 src/xenia/apu/xma_decoder.cc | 2 +-
 third_party/libav            | 2 +-
 third_party/libav-xma-bin    | 1 -
 6 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 160000 third_party/libav-xma-bin

diff --git a/.gitmodules b/.gitmodules
index 5757ad53b..4ffdd7bae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "third_party/capstone"]
 	path = third_party/capstone
 	url = https://github.com/xenia-project/capstone.git
-[submodule "third_party/libav-xma-bin"]
-	path = third_party/libav-xma-bin
-	url = https://github.com/xenia-project/libav-xma-bin.git
 [submodule "third_party/elemental-forms"]
 	path = third_party/elemental-forms
 	url = https://github.com/xenia-project/elemental-forms.git
diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua
index 647bf02d6..6214cea71 100644
--- a/src/xenia/apu/premake5.lua
+++ b/src/xenia/apu/premake5.lua
@@ -14,8 +14,8 @@ project("xenia-apu")
   defines({
   })
   includedirs({
-    project_root.."/third_party/libav/include/",
     project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/libav/",
   })
   local_platform_files()
 
diff --git a/src/xenia/apu/xma_context.cc b/src/xenia/apu/xma_context.cc
index 333366220..f6df1f9fa 100644
--- a/src/xenia/apu/xma_context.cc
+++ b/src/xenia/apu/xma_context.cc
@@ -20,9 +20,9 @@
 #include "xenia/profiling.h"
 
 extern "C" {
-#include "libavcodec/avcodec.h"
-#include "libavcodec/xma2dec.h"
-#include "libavutil/channel_layout.h"
+#include "third_party/libav/libavcodec/avcodec.h"
+#include "third_party/libav/libavcodec/xma2dec.h"
+#include "third_party/libav/libavutil/channel_layout.h"
 
 extern AVCodec ff_xma2_decoder;
 }  // extern "C"
diff --git a/src/xenia/apu/xma_decoder.cc b/src/xenia/apu/xma_decoder.cc
index a33968ef9..995ffbd41 100644
--- a/src/xenia/apu/xma_decoder.cc
+++ b/src/xenia/apu/xma_decoder.cc
@@ -22,7 +22,7 @@
 #include "xenia/profiling.h"
 
 extern "C" {
-#include "libavutil/log.h"
+#include "third_party/libav/libavutil/log.h"
 }  // extern "C"
 
 // As with normal Microsoft, there are like twelve different ways to access
diff --git a/third_party/libav b/third_party/libav
index 8be22f03d..c4ca82c2a 160000
--- a/third_party/libav
+++ b/third_party/libav
@@ -1 +1 @@
-Subproject commit 8be22f03d7e3c1663a66cc09375f840a7fc9a365
+Subproject commit c4ca82c2aeab50fa234ba41757bdf881d754ada8
diff --git a/third_party/libav-xma-bin b/third_party/libav-xma-bin
deleted file mode 160000
index a703710ec..000000000
--- a/third_party/libav-xma-bin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a703710ece1645a60b6648147927527f992b7fc1