Merge commit '596ea37298252ce239cfb6fd9c0f459574bd54e3'

external/toxcore/c-toxcore/toxav/BUILD.bazel

@@ -68,6 +68,19 @@ cc_library(
     ],
 )
 
+cc_test(
+    name = "rtp_test",
+    size = "small",
+    srcs = ["rtp_test.cc"],
+    deps = [
+        ":toxav",
+        "//c-toxcore/toxcore:crypto_core",
+        "//c-toxcore/toxcore:os_random",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 sh_library(
     name = "cimple_files",
     srcs = glob([

external/toxcore/c-toxcore/toxav/rtp_test.cc

@@ -3,6 +3,7 @@
 #include <gtest/gtest.h>
 
 #include "../toxcore/crypto_core.h"
+#include "../toxcore/os_random.h"
 
 namespace {
 

external/toxcore/c-toxcore/toxav/toxav.c

@@ -77,7 +77,7 @@ typedef struct DecodeTimeStats {
 } DecodeTimeStats;
 
 struct ToxAV {
-    const Memory *mem;
+    const struct Tox_Memory *mem;
     Logger *log;
     Tox *tox;
     MSISession *msi;