Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-07-19 11:18:00 +02:00
Code Issues Projects Releases Activity

Support older libavcodec versions and update .travis.yml for new dependencies

Browse Source
This commit is contained in:
darkf 2017-09-13 13:58:29 -05:00 committed by Daniel Evans
parent 727dbbd218
commit f4f0f28a14
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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

6
rwengine/src/audio/SoundManager.cpp
View File

@ -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>