mirror of
https://github.com/rwengine/openrw.git
synced 2024-09-15 15:02:34 +02:00
Support older libavcodec versions and update .travis.yml for new dependencies
This commit is contained in:
parent
727dbbd218
commit
f4f0f28a14
@ -11,10 +11,10 @@ addons:
|
|||||||
- g++-5
|
- g++-5
|
||||||
- libbullet-dev
|
- libbullet-dev
|
||||||
- libsdl2-dev
|
- libsdl2-dev
|
||||||
- libmad0-dev
|
|
||||||
- libglm-dev
|
- libglm-dev
|
||||||
- libsndfile-dev
|
|
||||||
- libopenal-dev
|
- libopenal-dev
|
||||||
|
- libavcodec-dev
|
||||||
|
- libavformat-dev
|
||||||
- libboost-filesystem-dev
|
- libboost-filesystem-dev
|
||||||
- libboost-program-options-dev
|
- libboost-program-options-dev
|
||||||
# Dependencies for BUILD_TESTS
|
# Dependencies for BUILD_TESTS
|
||||||
|
@ -8,6 +8,12 @@ extern "C" {
|
|||||||
#include <libavutil/avutil.h>
|
#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 <array>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
Loading…
Reference in New Issue
Block a user