FS-9525 part 2

src/mod/applications/mod_conference/conference_loop.c

@@ -1336,7 +1336,7 @@ void conference_loop_output(conference_member_t *member)
 						switch_change_sln_volume(write_frame.data, write_frame.samples * member->conference->channels, member->volume_out_level);
 					}
 
-					write_frame.timestamp = timer.samplecount;
+					//write_frame.timestamp = timer.samplecount;
 
 					if (member->fnode) {
 						conference_member_add_file_data(member, write_frame.data, write_frame.datalen);

src/switch_rtp.c

@@ -3696,7 +3696,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_ses
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	int change_timer = 0;
 
-	if (rtp_session->ms_per_packet && rtp_session->ms_per_packet != ms_per_packet) {
+	if (rtp_session->ms_per_packet != ms_per_packet || rtp_session->samples_per_interval != samples_per_interval) {
 		change_timer = 1;
 	}