diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-08-12 10:55:20 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-08-12 11:38:23 +0000 |
commit | 1de8b020cb5f79c3e52a0fb502b5abdbbd20a2f0 (patch) | |
tree | afae3b1329d340f92484571676c36a0e0fba836c /toxav/video.h | |
parent | 5d15b5930d2b3e442f3927d72a76dd6a9c3b3357 (diff) |
Remove all uses of the PAIR macro in toxav.
Diffstat (limited to 'toxav/video.h')
-rw-r--r-- | toxav/video.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/toxav/video.h b/toxav/video.h index 7a0913a0..19ceb9ba 100644 --- a/toxav/video.h +++ b/toxav/video.h | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include "../toxcore/logger.h" | 25 | #include "../toxcore/logger.h" |
26 | #include "../toxcore/util.h" | 26 | #include "../toxcore/util.h" |
27 | #include "pair.h" | ||
28 | 27 | ||
29 | #include <vpx/vpx_decoder.h> | 28 | #include <vpx/vpx_decoder.h> |
30 | #include <vpx/vpx_encoder.h> | 29 | #include <vpx/vpx_encoder.h> |
@@ -55,7 +54,9 @@ typedef struct VCSession_s { | |||
55 | ToxAV *av; | 54 | ToxAV *av; |
56 | uint32_t friend_number; | 55 | uint32_t friend_number; |
57 | 56 | ||
58 | PAIR(toxav_video_receive_frame_cb *, void *) vcb; /* Video frame receive callback */ | 57 | /* Video frame receive callback */ |
58 | toxav_video_receive_frame_cb *vcb; | ||
59 | void *vcb_user_data; | ||
59 | 60 | ||
60 | pthread_mutex_t queue_mutex[1]; | 61 | pthread_mutex_t queue_mutex[1]; |
61 | } VCSession; | 62 | } VCSession; |