games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-02 00:10:22 +02:00
Code Issues Releases Activity

Merge pull request #81 from Mixaill/develop

Browse Source 
Fix Travis build
This commit is contained in:
Alexander Shishkin 2015-01-29 02:51:48 +03:00
commit 4bd298f218
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ before_install:
#new Qt
- sudo add-apt-repository --yes ppa:beineri/opt-qt532
#new FFmpeg
- sudo add-apt-repository --yes ppa:djcj/vlc-stable
- sudo add-apt-repository --yes ppa:jon-severinsson/ffmpeg
#new CMake
- sudo add-apt-repository --yes ppa:andykimpe/cmake

14
client/CVideoHandler.h
View File

@ -30,7 +30,7 @@ public:
class CEmptyVideoPlayer : public IMainVideoPlayer
{
public:
public:
int curFrame() const override {return -1;};
int frameCount() const override {return -1;};
void redraw( int x, int y, SDL_Surface *dst, bool update = true ) override {};
@ -54,6 +54,18 @@ public:
extern "C" {
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
// compatibility with different versions od libavutil
#if (LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 42, 0)) || \
(LIBAVUTIL_VERSION_INT == AV_VERSION_INT(51, 73, 101))
#define AV_PIX_FMT_NONE PIX_FMT_NONE
#define AV_PIX_FMT_NV12 PIX_FMT_NV12
#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
#define AV_PIX_FMT_UYVY422 PIX_FMT_UYVY422
#define AV_PIX_FMT_YUYV422 PIX_FMT_YUYV422
#endif
}
class CVideoPlayer : public IMainVideoPlayer