StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
irungentoo 2013-10-26 23:17:34 -04:00
commit 937dbd3a7a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toxmsi/AV_codec.c
View File

@ -36,8 +36,8 @@
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
#include <SDL.h> #include <SDL/SDL.h>
#include <SDL_thread.h> #include <SDL/SDL_thread.h>
#include <pthread.h> #include <pthread.h>
#include <opus/opus.h> #include <opus/opus.h>
@ -48,6 +48,8 @@
#include "phone.h" #include "phone.h"
#include "AV_codec.h" #include "AV_codec.h"
SDL_Surface *screen;
int display_received_frame(codec_state *cs, AVFrame *r_video_frame) int display_received_frame(codec_state *cs, AVFrame *r_video_frame)
{ {
AVPicture pict; AVPicture pict;

4
toxmsi/AV_codec.h
View File

@ -38,7 +38,7 @@
#include "../toxrtp/toxrtp.h" #include "../toxrtp/toxrtp.h"
#include "../toxcore/tox.h" #include "../toxcore/tox.h"
#include <SDL.h> #include <SDL/SDL.h>
#include <opus/opus.h> #include <opus/opus.h>
/* ffmpeg VP8 codec ID */ /* ffmpeg VP8 codec ID */
@ -75,7 +75,7 @@
#define DEFAULT_WEBCAM "0" #define DEFAULT_WEBCAM "0"
#endif #endif
SDL_Surface *screen; extern SDL_Surface *screen;
typedef struct { typedef struct {
SDL_Overlay *bmp; SDL_Overlay *bmp;