diff options
author | irungentoo <irungentoo@gmail.com> | 2014-04-15 18:31:10 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-04-15 18:31:10 -0400 |
commit | 3835bc167b37a0faada3362a1f3a57632d58b6da (patch) | |
tree | 8299e80e4782b49c4de4c68e87cdd101b2aca337 /toxav | |
parent | 229b2b2dcdcab20f35063da9e69b6ef0ded70231 (diff) | |
parent | 20336c007690d92740e48f3c4fcad562fbaaa6e9 (diff) |
Merge branch 'master' of https://github.com/tycho/ProjectTox-Core into tycho-master
Diffstat (limited to 'toxav')
-rw-r--r-- | toxav/Makefile.inc | 3 | ||||
-rw-r--r-- | toxav/media.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index 0cad1840..ab9352d2 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
@@ -18,15 +18,18 @@ libtoxav_la_SOURCES = ../toxav/event.h \ | |||
18 | 18 | ||
19 | libtoxav_la_CFLAGS = -I../toxcore \ | 19 | libtoxav_la_CFLAGS = -I../toxcore \ |
20 | -I../toxav \ | 20 | -I../toxav \ |
21 | $(LIBSODIUM_CFLAGS) \ | ||
21 | $(NACL_CFLAGS) \ | 22 | $(NACL_CFLAGS) \ |
22 | $(AV_CFLAGS) \ | 23 | $(AV_CFLAGS) \ |
23 | $(PTHREAD_CFLAGS) | 24 | $(PTHREAD_CFLAGS) |
24 | 25 | ||
25 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | 26 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ |
27 | $(LIBSODIUM_LDFLAGS) \ | ||
26 | $(NACL_LDFLAGS) \ | 28 | $(NACL_LDFLAGS) \ |
27 | $(EXTRA_LT_LDFLAGS) | 29 | $(EXTRA_LT_LDFLAGS) |
28 | 30 | ||
29 | libtoxav_la_LIBADD = libtoxcore.la \ | 31 | libtoxav_la_LIBADD = libtoxcore.la \ |
32 | $(LIBSODIUM_LIBS) \ | ||
30 | $(NACL_LIBS) \ | 33 | $(NACL_LIBS) \ |
31 | $(PTHREAD_LIBS) \ | 34 | $(PTHREAD_LIBS) \ |
32 | $(AV_LIBS) | 35 | $(AV_LIBS) |
diff --git a/toxav/media.h b/toxav/media.h index f5c5fbe4..57817516 100644 --- a/toxav/media.h +++ b/toxav/media.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx()) | 36 | #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx()) |
37 | 37 | ||
38 | /* Audio encoding/decoding */ | 38 | /* Audio encoding/decoding */ |
39 | #include <opus/opus.h> | 39 | #include <opus.h> |
40 | 40 | ||
41 | typedef enum _Capabilities | 41 | typedef enum _Capabilities |
42 | { | 42 | { |