Fixing build and removing old binary libav submodule.

.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

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()
 

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"

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

third_party/libav

@@ -1 +1 @@
-Subproject commit 8be22f03d7e3c1663a66cc09375f840a7fc9a365
+Subproject commit c4ca82c2aeab50fa234ba41757bdf881d754ada8

third_party/libav-xma-bin

@@ -1 +0,0 @@
-Subproject commit a703710ece1645a60b6648147927527f992b7fc1