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

Fix compilation with some versions of libavutil

Browse Source
This commit is contained in:
Mikhail Paulyshka
2015-01-28 22:46:28 +03:00
parent ba51de8b5f
commit 9b76ca0b27
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/CVideoHandler.h
View File

@ -30,7 +30,7 @@ public:
class CEmptyVideoPlayer : public IMainVideoPlayer class CEmptyVideoPlayer : public IMainVideoPlayer
{ {
public: public:
int curFrame() const override {return -1;}; int curFrame() const override {return -1;};
int frameCount() const override {return -1;}; int frameCount() const override {return -1;};
void redraw( int x, int y, SDL_Surface *dst, bool update = true ) override {}; void redraw( int x, int y, SDL_Surface *dst, bool update = true ) override {};
@ -54,6 +54,18 @@ public:
extern "C" { extern "C" {
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswscale/swscale.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 class CVideoPlayer : public IMainVideoPlayer