Merge "func_jitterbuffer: Add audio/video sync support."

diff --cc include/asterisk/rtp_engine.h
Simple merge

diff --cc main/rtp_engine.c
Simple merge

diff --cc res/res_rtp_asterisk.c
index e96223f7a71ea019303833735cb32767b6bdcdee,8c04ac11817c0c0a8cfba382cbc22100e2e42795..c65cf627d16be493c7b1ff9648f2dd0eb5a94a96
--- 1/res/res_rtp_asterisk.c
--- 2/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@@ -4684,11 -4584,8 +4675,11 @@@ static int rtp_raw_write(struct ast_rtp
        int pred, mark = 0;
        unsigned int ms = calc_txstamp(rtp, &frame->delivery);
        struct ast_sockaddr remote_address = { {0,} };
-       int rate = rtp_get_rate(frame->subclass.format) / 1000;
+       int rate = ast_rtp_get_rate(frame->subclass.format) / 1000;
        unsigned int seqno;
 +#ifdef TEST_FRAMEWORK
 +      struct ast_rtp_engine_test *test = ast_rtp_instance_get_test(instance);
 +#endif
  
        if (ast_format_cmp(frame->subclass.format, ast_format_g722) == AST_FORMAT_CMP_EQUAL) {
                frame->samples /= 2;