Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core

2 files changed, 6 insertions, 4 deletions

diff --git a/toxmsi/AV_codec.c b/toxmsi/AV_codec.c
index 82e6a320..8a50c894 100644
--- a/toxmsi/AV_codec.c
+++ b/toxmsi/AV_codec.c
@@ -36,8 +36,8 @@
 #include <libavutil/opt.h>
 #include <AL/al.h>
 #include <AL/alc.h>
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 #include <pthread.h>
 #include <opus/opus.h>
 
@@ -48,6 +48,8 @@
 #include "phone.h"
 #include "AV_codec.h"
 
+SDL_Surface *screen;
+
 int display_received_frame(codec_state *cs, AVFrame *r_video_frame)
 {
     AVPicture pict;
diff --git a/toxmsi/AV_codec.h b/toxmsi/AV_codec.h
index 641cf486..bf5951d2 100644
--- a/toxmsi/AV_codec.h
+++ b/toxmsi/AV_codec.h
@@ -38,7 +38,7 @@
 #include "../toxrtp/toxrtp.h"
 #include "../toxcore/tox.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 #include <opus/opus.h>
 
 /* ffmpeg VP8 codec ID */
@@ -75,7 +75,7 @@
 #define DEFAULT_WEBCAM "0"
 #endif
 
-SDL_Surface     *screen;
+extern SDL_Surface *screen;
 
 typedef struct {
     SDL_Overlay *bmp;