Merge pull request #81 from Mixaill/develop

Fix Travis build

.travis.yml

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

client/CVideoHandler.h

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