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 } +// 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 #include #include