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/tycho/ProjectTox-Core into tycho-master

Browse Source
This commit is contained in:
irungentoo 2014-04-15 18:31:10 -04:00
commit 3835bc167b
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toxav/Makefile.inc
View File

@ -18,15 +18,18 @@ libtoxav_la_SOURCES = ../toxav/event.h \
libtoxav_la_CFLAGS = -I../toxcore \ libtoxav_la_CFLAGS = -I../toxcore \
-I../toxav \ -I../toxav \
$(LIBSODIUM_CFLAGS) \
$(NACL_CFLAGS) \ $(NACL_CFLAGS) \
$(AV_CFLAGS) \ $(AV_CFLAGS) \
$(PTHREAD_CFLAGS) $(PTHREAD_CFLAGS)
libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
$(LIBSODIUM_LDFLAGS) \
$(NACL_LDFLAGS) \ $(NACL_LDFLAGS) \
$(EXTRA_LT_LDFLAGS) $(EXTRA_LT_LDFLAGS)
libtoxav_la_LIBADD = libtoxcore.la \ libtoxav_la_LIBADD = libtoxcore.la \
$(LIBSODIUM_LIBS) \
$(NACL_LIBS) \ $(NACL_LIBS) \
$(PTHREAD_LIBS) \ $(PTHREAD_LIBS) \
$(AV_LIBS) $(AV_LIBS)

2
toxav/media.h
View File

@ -36,7 +36,7 @@
#define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx()) #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx())
/* Audio encoding/decoding */ /* Audio encoding/decoding */
#include <opus/opus.h> #include <opus.h>
typedef enum _Capabilities typedef enum _Capabilities
{ {