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

toxav/Makefile.inc

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

toxav/media.h

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