Merge commit 'aae086cc650e42eec1eea8db28cd01fa868d7f90'
This commit is contained in:
8
external/toxcore/c-toxcore/toxav/video.c
vendored
8
external/toxcore/c-toxcore/toxav/video.c
vendored
@ -140,7 +140,7 @@ static void vc_init_encoder_cfg(const Logger *log, vpx_codec_enc_cfg_t *cfg, int
|
||||
cfg->rc_buf_initial_sz = 500;
|
||||
cfg->rc_buf_optimal_sz = 600;
|
||||
cfg->rc_buf_sz = 1000;
|
||||
#endif
|
||||
#endif /* 0 */
|
||||
}
|
||||
|
||||
VCSession *vc_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
|
||||
@ -249,7 +249,7 @@ VCSession *vc_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t f
|
||||
goto BASE_CLEANUP_1;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* 0 */
|
||||
vc->linfts = current_time_monotonic(mono_time);
|
||||
vc->lcfd = 60;
|
||||
vc->vcb = cb;
|
||||
@ -343,9 +343,9 @@ void vc_iterate(VCSession *vc)
|
||||
}
|
||||
}
|
||||
|
||||
int vc_queue_message(Mono_Time *mono_time, void *vcp, struct RTPMessage *msg)
|
||||
int vc_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg)
|
||||
{
|
||||
VCSession *vc = (VCSession *)vcp;
|
||||
VCSession *vc = (VCSession *)cs;
|
||||
|
||||
/* This function is called with complete messages
|
||||
* they have already been assembled.
|
||||
|
Reference in New Issue
Block a user