From f4f0f28a14445d924be9c20b854e8583d62a8be8 Mon Sep 17 00:00:00 2001
From: darkf <lw9k123@gmail.com>
Date: Wed, 13 Sep 2017 13:58:29 -0500
Subject: [PATCH] Support older libavcodec versions and update .travis.yml for
 new dependencies

---
 .travis.yml                         | 4 ++--
 rwengine/src/audio/SoundManager.cpp | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df8ca844..e58c4b9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,10 @@ addons:
       - g++-5
       - libbullet-dev
       - libsdl2-dev
-      - libmad0-dev
       - libglm-dev
-      - libsndfile-dev
       - libopenal-dev
+      - libavcodec-dev
+      - libavformat-dev
       - libboost-filesystem-dev
       - libboost-program-options-dev
       # Dependencies for BUILD_TESTS
diff --git a/rwengine/src/audio/SoundManager.cpp b/rwengine/src/audio/SoundManager.cpp
index 53fa21a8..d2068d8e 100644
--- a/rwengine/src/audio/SoundManager.cpp
+++ b/rwengine/src/audio/SoundManager.cpp
@@ -8,6 +8,12 @@ extern "C" {
 #include <libavutil/avutil.h>
 }
 
+// Rename some functions for older libavcodec/ffmpeg versions (e.g. Ubuntu Trusty)
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
+#define av_frame_alloc  avcodec_alloc_frame
+#define av_frame_free   avcodec_free_frame
+#endif
+
 #include <array>
 #include <iostream>
 #include <fstream>