diff --git a/.github/workflows/janus-ci.yml b/.github/workflows/janus-ci.yml
index 35b8a9561f..b54cddf66b 100644
--- a/.github/workflows/janus-ci.yml
+++ b/.github/workflows/janus-ci.yml
@@ -14,7 +14,7 @@ jobs:
         datachannels: ["yes", "no"]
         libcurl: ["yes", "no"]
         include:
-          - datachannel: "yes"
+          - datachannels: "yes"
             libcurl: "yes"
             deps_from_src: "yes"
             janus_config_opts: ""
diff --git a/Makefile.am b/Makefile.am
index 67b3b78035..576c2c17f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -585,6 +585,8 @@ janus_pp_rec_SOURCES = \
 	postprocessing/pp-h264.h \
 	postprocessing/pp-av1.c \
 	postprocessing/pp-av1.h \
+	postprocessing/pp-avformat.c \
+	postprocessing/pp-avformat.h \
 	postprocessing/pp-h265.c \
 	postprocessing/pp-h265.h \
 	postprocessing/pp-opus.c \
diff --git a/README.md b/README.md
index 3c86cac1a6..f2bfd40ff6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ To install it, you'll need to satisfy the following dependencies:
 
 * [Jansson](http://www.digip.org/jansson/)
 * [libconfig](https://hyperrealm.github.io/libconfig/)
-* [libnice](https://libnice.freedesktop.org/) (at least v0.1.16 suggested, master recommended)
+* [libnice](https://libnice.freedesktop.org/) (at least v0.1.16 suggested, v0.1.18 recommended)
 * [OpenSSL](http://www.openssl.org/) (at least v1.0.1e)
 * [libsrtp](https://github.com/cisco/libsrtp) (at least v2.x suggested)
 * [usrsctp](https://github.com/sctplab/usrsctp) (only needed if you are interested in Data Channels)
diff --git a/conf/janus.eventhandler.rabbitmqevh.jcfg.sample b/conf/janus.eventhandler.rabbitmqevh.jcfg.sample
index a29ec4e3cb..c8635e2453 100644
--- a/conf/janus.eventhandler.rabbitmqevh.jcfg.sample
+++ b/conf/janus.eventhandler.rabbitmqevh.jcfg.sample
@@ -20,7 +20,7 @@ general: {
 	#exchange = "janus-exchange"
 	route_key = "janus-events"		# Routing key to use when publishing messages
 	#exchange_type = "fanout" 		# Rabbitmq exchange_type can be one of the available types: direct, topic, headers and fanout (fanout by defualt).
-	#heartbeat = 60 				# Defines the seconds without communication that should pass before considering the TCP connection has unreachable.
+	#heartbeat = 60 				# Defines the seconds without communication that should pass before considering the TCP connection unreachable.
 	#declare_outgoing_queue = true # By default (for backwards compatibility), we declare an outgoing queue. Set this to false to disable that behavior
 
 	#ssl_enable = false				# Whether ssl support must be enabled
diff --git a/conf/janus.plugin.audiobridge.jcfg.sample b/conf/janus.plugin.audiobridge.jcfg.sample
index b4a7929187..e57a20f109 100644
--- a/conf/janus.plugin.audiobridge.jcfg.sample
+++ b/conf/janus.plugin.audiobridge.jcfg.sample
@@ -4,6 +4,7 @@
 # secret = "<optional password needed for manipulating (e.g. destroying) the room>"
 # pin = "<optional password needed for joining the room>"
 # sampling_rate = <sampling rate> (e.g., 16000 for wideband mixing)
+# spatial_audio = true|false (if true, the mix will be stereo to spatially place users, default=false)
 # audiolevel_ext = true|false (whether the ssrc-audio-level RTP extension must
 #		be negotiated/used or not for new joins, default=true)
 # audiolevel_event = true|false (whether to emit event to other users or not, default=false)
diff --git a/conf/janus.transport.rabbitmq.jcfg.sample b/conf/janus.transport.rabbitmq.jcfg.sample
index 9aae80ef0a..27cfebd0a0 100644
--- a/conf/janus.transport.rabbitmq.jcfg.sample
+++ b/conf/janus.transport.rabbitmq.jcfg.sample
@@ -34,6 +34,7 @@ general: {
 	#queue_durable = false				# Whether or not incoming queue should remain after a RabbitMQ reboot
 	#queue_autodelete = false			# Whether or not incoming queue should autodelete after janus disconnects from RabbitMQ
 	#queue_exclusive = false			# Whether or not incoming queue should only allow one subscriber
+	#heartbeat = 60 				# Defines the seconds without communication that should pass before considering the TCP connection unreachable.
 
 	#ssl_enabled = false				# Whether ssl support must be enabled
 	#ssl_verify_peer = true				# Whether peer verification must be enabled
diff --git a/configure.ac b/configure.ac
index 8315f2b6b8..69827ed9eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,6 +605,7 @@ AC_CHECK_LIB([rabbitmq],
                  AC_DEFINE(HAVE_RABBITMQEVH)
                  enable_rabbitmq_event_handler=yes
                ])
+               AC_CHECK_HEADERS([rabbitmq-c/amqp.h])
              ],
              [
                AS_IF([test "x$enable_rabbitmq" = "xyes"],
diff --git a/events/janus_rabbitmqevh.c b/events/janus_rabbitmqevh.c
index 9fda6ddced..003ddf22be 100644
--- a/events/janus_rabbitmqevh.c
+++ b/events/janus_rabbitmqevh.c
@@ -12,10 +12,18 @@
 
 #include <math.h>
 
+/* Latest RabbitMQ-C library changes the library paths from 0.12.0.0 onwards */
+#ifdef HAVE_RABBITMQ_C_AMQP_H
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/framing.h>
+#include <rabbitmq-c/tcp_socket.h>
+#include <rabbitmq-c/ssl_socket.h>
+#else
 #include <amqp.h>
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
+#endif
 
 #include "../debug.h"
 #include "../config.h"
@@ -177,7 +185,7 @@ int janus_rabbitmqevh_init(const char *config_path) {
 			/* Compact, so no spaces between separators */
 			json_format = JSON_COMPACT | JSON_PRESERVE_ORDER;
 		} else {
-			JANUS_LOG(LOG_WARN, "Unsupported JSON format option '%s', using default (indented)\n", item->value);
+			JANUS_LOG(LOG_WARN, "RabbitMQEventHandler: Unsupported JSON format option '%s', using default (indented)\n", item->value);
 			json_format = JSON_INDENT(3) | JSON_PRESERVE_ORDER;
 		}
 	}
@@ -224,7 +232,7 @@ int janus_rabbitmqevh_init(const char *config_path) {
 
 	item = janus_config_get(config, config_general, janus_config_type_item, "heartbeat");
 	if(item && item->value && janus_string_to_uint16(item->value, &heartbeat) < 0) {
-		JANUS_LOG(LOG_ERR, "Invalid heartbeat timeout (%s), falling back to default\n", item->value);
+		JANUS_LOG(LOG_ERR, "RabbitMQEventHandler: Invalid heartbeat timeout (%s), falling back to default (0, disabling heartbeat)\n", item->value);
 		heartbeat = 0;
 	}
 
@@ -279,9 +287,9 @@ int janus_rabbitmqevh_init(const char *config_path) {
 		exchange = g_strdup(item->value);
 	}
 	if (exchange == NULL) {
-		JANUS_LOG(LOG_INFO, "RabbitMQ event handler enabled, %s:%d (%s) exchange_type:%s\n", rmqhost, rmqport, route_key,exchange_type);
+		JANUS_LOG(LOG_INFO, "RabbitMQEventHandler: enabled, %s:%d (%s) exchange_type:%s\n", rmqhost, rmqport, route_key,exchange_type);
 	} else {
-		JANUS_LOG(LOG_INFO, "RabbitMQ event handler enabled, %s:%d (%s) exch: (%s) exchange_type:%s\n", rmqhost, rmqport, route_key, exchange,exchange_type);
+		JANUS_LOG(LOG_INFO, "RabbitMQEventHandler: enabled, %s:%d (%s) exch: (%s) exchange_type:%s\n", rmqhost, rmqport, route_key, exchange,exchange_type);
 	}
 
 	/* Connect */
@@ -300,7 +308,7 @@ int janus_rabbitmqevh_init(const char *config_path) {
 	handler_thread = g_thread_try_new("janus rabbitmqevh handler", jns_rmqevh_hdlr, NULL, &error);
 	if(error != NULL) {
 		g_atomic_int_set(&initialized, 0);
-		JANUS_LOG(LOG_FATAL, "Got error %d (%s) trying to launch the RabbitMQEventHandler handler thread...\n",
+		JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Got error %d (%s) trying to launch the RabbitMQEventHandler handler thread...\n",
 			error->code, error->message ? error->message : "??");
 		g_error_free(error);
 		goto error;
@@ -309,7 +317,7 @@ int janus_rabbitmqevh_init(const char *config_path) {
 		in_thread = g_thread_try_new("janus rabbitmqevh heartbeat handler", jns_rmqevh_hrtbt, NULL, &error);
 		if(error != NULL) {
 			g_atomic_int_set(&initialized, 0);
-			JANUS_LOG(LOG_FATAL, "Got error %d (%s) trying to launch the RabbitMQEventHandler heartbeat thread...\n",
+			JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Got error %d (%s) trying to launch the RabbitMQEventHandler heartbeat thread...\n",
 				error->code, error->message ? error->message : "??");
 			g_error_free(error);
 			goto error;
@@ -350,16 +358,10 @@ int janus_rabbitmqevh_connect(void) {
 			JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Can't connect to RabbitMQ server: error creating socket...\n");
 			return -1;
 		}
-		if(ssl_verify_peer) {
-			amqp_ssl_socket_set_verify_peer(socket, 1);
-		} else {
-			amqp_ssl_socket_set_verify_peer(socket, 0);
-		}
-		if(ssl_verify_hostname) {
-			amqp_ssl_socket_set_verify_hostname(socket, 1);
-		} else {
-			amqp_ssl_socket_set_verify_hostname(socket, 0);
-		}
+
+		amqp_ssl_socket_set_verify_peer(socket, ssl_verify_peer);
+		amqp_ssl_socket_set_verify_hostname(socket, ssl_verify_hostname);
+
 		if(ssl_cacert_file) {
 			status = amqp_ssl_socket_set_cacert(socket, ssl_cacert_file);
 			if(status != AMQP_STATUS_OK) {
@@ -385,7 +387,7 @@ int janus_rabbitmqevh_connect(void) {
 	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Connecting to RabbitMQ server...\n");
 	status = amqp_socket_open(socket, rmqhost, rmqport);
 	if(status != AMQP_STATUS_OK) {
-		JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error opening socket... (%s)\n", amqp_error_string2(status));
+		JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Can't connect to RabbitMQ server: error opening socket... (%s)\n", amqp_error_string2(status));
 		return -1;
 	}
 	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Logging in...\n");
@@ -410,13 +412,13 @@ int janus_rabbitmqevh_connect(void) {
 		amqp_exchange_declare(rmq_conn, rmq_channel, rmq_exchange, amqp_cstring_bytes(exchange_type), 0, 0, 0, 0, amqp_empty_table);
 		result = amqp_get_rpc_reply(rmq_conn);
 		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-			JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Can't connect to RabbitMQ server: error diclaring exchange... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+			JANUS_LOG(LOG_FATAL, "RabbitMQEventHandler: Can't connect to RabbitMQ server: error declaring exchange... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
 			return -1;
 		}
 	}
 
 	if (declare_outgoing_queue) {
-		JANUS_LOG(LOG_VERB, "Declaring outgoing queue... (%s)\n", route_key);
+		JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Declaring outgoing queue... (%s)\n", route_key);
 		amqp_queue_declare(rmq_conn, rmq_channel, amqp_cstring_bytes(route_key), 0, 0, 0, 0, amqp_empty_table);
 		result = amqp_get_rpc_reply(rmq_conn);
 		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
@@ -425,6 +427,8 @@ int janus_rabbitmqevh_connect(void) {
 		}
 	}
 
+	JANUS_LOG(LOG_INFO, "RabbitMQEventHandler: Connected successfully");
+
 	return 0;
 }
 
@@ -446,9 +450,7 @@ void janus_rabbitmqevh_destroy(void) {
 	g_async_queue_unref(events);
 	events = NULL;
 
-	if(rmq_conn && rmq_channel) {
-		amqp_channel_close(rmq_conn, rmq_channel, AMQP_REPLY_SUCCESS);
-		amqp_connection_close(rmq_conn, AMQP_REPLY_SUCCESS);
+	if(rmq_conn) {
 		amqp_destroy_connection(rmq_conn);
 	}
 	if(rmq_exchange.bytes)
@@ -548,7 +550,7 @@ json_t *janus_rabbitmqevh_handle_request(json_t *request) {
 		if(json_object_get(request, "grouping"))
 			group_events = json_is_true(json_object_get(request, "grouping"));
 	} else {
-		JANUS_LOG(LOG_VERB, "Unknown request '%s'\n", request_text);
+		JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Unknown request '%s'\n", request_text);
 		error_code = JANUS_RABBITMQEVH_ERROR_INVALID_REQUEST;
 		g_snprintf(error_cause, 512, "Unknown request '%s'", request_text);
 	}
@@ -570,7 +572,7 @@ json_t *janus_rabbitmqevh_handle_request(json_t *request) {
 
 /* Thread to handle incoming events */
 static void *jns_rmqevh_hdlr(void *data) {
-	JANUS_LOG(LOG_VERB, "Joining RabbitMQEventHandler handler thread\n");
+	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: joining handler thread\n");
 	json_t *event = NULL, *output = NULL;
 	char *event_text = NULL;
 	int count = 0, max = group_events ? 100 : 1;
@@ -589,7 +591,7 @@ static void *jns_rmqevh_hdlr(void *data) {
 			if(created && json_is_integer(created)) {
 				gint64 then = json_integer_value(created);
 				gint64 now = janus_get_monotonic_time();
-				JANUS_LOG(LOG_DBG, "Handled event after %"SCNu64" us\n", now-then);
+				JANUS_LOG(LOG_DBG, "RabbitMQEventHandler: Handled event after %"SCNu64" us\n", now-then);
 			}
 			if(!group_events) {
 				/* We're done here, we just need a single event */
@@ -613,7 +615,7 @@ static void *jns_rmqevh_hdlr(void *data) {
 			/* Since this a simple plugin, it does the same for all events: so just convert to string... */
 			event_text = json_dumps(output, json_format);
 			if(event_text == NULL) {
-				JANUS_LOG(LOG_WARN, "Failed to stringify event, event lost...\n");
+				JANUS_LOG(LOG_WARN, "RabbitMQEventHandler: Failed to stringify event, event lost...\n");
 				/* Nothing we can do... get rid of the event */
 				json_decref(output);
 				output = NULL;
@@ -638,14 +640,14 @@ static void *jns_rmqevh_hdlr(void *data) {
 		json_decref(output);
 		output = NULL;
 	}
-	JANUS_LOG(LOG_VERB, "Leaving RabbitMQEventHandler handler thread\n");
+	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: leaving handler thread\n");
 	return NULL;
 }
 
 
 /* Thread to handle heartbeats */
 static void *jns_rmqevh_hrtbt(void *data) {
-	JANUS_LOG(LOG_VERB, "Monitoring RabbitMQ HeartBeat\n");
+	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Monitoring RabbitMQ Heartbeat\n");
 	int waiting_usec = (heartbeat/2) * 1000000;
 	struct timeval timeout;
 	timeout.tv_sec = 0;
@@ -666,15 +668,13 @@ static void *jns_rmqevh_hrtbt(void *data) {
 				continue;
 			}
 
-			JANUS_LOG(LOG_VERB, "Error on amqp_simple_wait_frame_noblock: %d (%s)\n", res, amqp_error_string2(res));
+			JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Error on amqp_simple_wait_frame_noblock: %d (%s)\n", res, amqp_error_string2(res));
 
-			if(rmq_conn && rmq_channel) {
-				amqp_channel_close(rmq_conn, rmq_channel, AMQP_REPLY_SUCCESS);
-				amqp_connection_close(rmq_conn, AMQP_REPLY_SUCCESS);
+			if(rmq_conn) {
 				amqp_destroy_connection(rmq_conn);
 			}
 			if(!g_atomic_int_get(&stopping)) {
-				JANUS_LOG(LOG_VERB, "Trying to reconnect with RabbitMQ Server\n");
+				JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Trying to reconnect\n");
 				int result = janus_rabbitmqevh_connect();
 				if(result < 0) {
 					g_usleep(5000000);
@@ -688,6 +688,6 @@ static void *jns_rmqevh_hrtbt(void *data) {
 		}
 	}
 
-	JANUS_LOG(LOG_VERB, "Leaving RabbitMQEventHandler HeartBeat thread\n");
+	JANUS_LOG(LOG_VERB, "RabbitMQEventHandler: Leaving HeartBeat thread\n");
 	return NULL;
 }
diff --git a/fuzzers/config.sh b/fuzzers/config.sh
index de548eb78f..a362261956 100755
--- a/fuzzers/config.sh
+++ b/fuzzers/config.sh
@@ -16,7 +16,7 @@ DEFAULT_CC="clang"
 DEFAULT_CCLD=$DEFAULT_CC
 DEFAULT_CFLAGS="-O1 -fno-omit-frame-pointer -g -ggdb3 -fsanitize=address,undefined -fsanitize-address-use-after-scope -fno-sanitize-recover=undefined -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
 DEFAULT_LDFLAGS="-O1 -fno-omit-frame-pointer -g -ggdb3 -fsanitize=address,undefined -fno-sanitize-recover=undefined -fsanitize-address-use-after-scope"
-COVERAGE_CFLAGS="-O1 -fno-omit-frame-pointer -g -ggdb3 -fprofile-instr-generate -fcoverage-mapping -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+COVERAGE_CFLAGS="-O1 -fno-omit-frame-pointer -g -ggdb3 -fprofile-instr-generate -fcoverage-mapping -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
 COVERAGE_LDFLAGS="-O1 -fno-omit-frame-pointer -g -ggdb3 -fprofile-instr-generate -fcoverage-mapping -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
 
 # Janus configure flags
diff --git a/html/audiobridgetest.html b/html/audiobridgetest.html
index 6621aca885..c30994b1c8 100644
--- a/html/audiobridgetest.html
+++ b/html/audiobridgetest.html
@@ -11,6 +11,7 @@
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.6.2/bootstrap-slider.min.js"></script>
 <script type="text/javascript" src="janus.js" ></script>
 <script type="text/javascript" src="audiobridgetest.js"></script>
 <script>
@@ -25,6 +26,7 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cerulean/bootstrap.min.css" type="text/css"/>
 <link rel="stylesheet" href="css/demo.css" type="text/css"/>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" type="text/css"/>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.6.2/css/bootstrap-slider.css" type="text/css"/>
 </head>
 <body>
 
@@ -80,7 +82,8 @@ <h3>Demo details</h3>
 						<div class="panel panel-default">
 							<div class="panel-heading">
 								<h3 class="panel-title">Participants <span class="label label-info hide" id="participant"></span>
-								<button class="btn-xs btn-danger hide pull-right" autocomplete="off" id="toggleaudio">Mute</button></h3>
+								<button class="btn-xs btn-danger hide pull-right" autocomplete="off" id="toggleaudio">Mute</button>
+								<button class="btn-xs btn-primary hide pull-right" autocomplete="off" id="position">Position</button></h3>
 							</div>
 							<div class="panel-body">
 								<ul id="list" class="list-group">
diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js
index 6d0de4f7c5..7478d56a01 100644
--- a/html/audiobridgetest.js
+++ b/html/audiobridgetest.js
@@ -57,6 +57,9 @@ var spinner = null;
 var myroom = 1234;	// Demo room
 if(getQueryStringValue("room") !== "")
 	myroom = parseInt(getQueryStringValue("room"));
+var stereo = false;
+if(getQueryStringValue("stereo") !== "")
+	stereo = (getQueryStringValue("stereo") === "true");
 var myusername = null;
 var myid = null;
 var webrtcUp = false;
@@ -146,7 +149,13 @@ $(document).ready(function() {
 													// Publish our stream
 													mixertest.createOffer(
 														{
-															media: { video: false},	// This is an audio only room
+															media: { video: false },	// This is an audio only room
+															customizeSdp: function(jsep) {
+																if(stereo && jsep.sdp.indexOf("stereo=1") == -1) {
+																	// Make sure that our offer contains stereo too
+																	jsep.sdp = jsep.sdp.replace("useinbandfec=1", "useinbandfec=1;stereo=1");
+																}
+															},
 															success: function(jsep) {
 																Janus.debug("Got SDP!", jsep);
 																var publish = { request: "configure", muted: false };
@@ -168,22 +177,34 @@ $(document).ready(function() {
 													var display = list[f]["display"];
 													var setup = list[f]["setup"];
 													var muted = list[f]["muted"];
+													var spatial = list[f]["spatial_position"];
 													Janus.debug("  >> [" + id + "] " + display + " (setup=" + setup + ", muted=" + muted + ")");
-													if($('#rp'+id).length === 0) {
+													if($('#rp' + id).length === 0) {
 														// Add to the participants list
-														$('#list').append('<li id="rp'+id+'" class="list-group-item">'+display+
+														var slider = '';
+														if(spatial !== null && spatial !== undefined)
+															slider = '<span>[L <input id="sp' + id + '" type="text" style="width: 10%;"/> R] </span>';
+														$('#list').append('<li id="rp' + id +'" class="list-group-item">' +
+															slider +
+															display +
 															' <i class="absetup fa fa-chain-broken"></i>' +
 															' <i class="abmuted fa fa-microphone-slash"></i></li>');
-														$('#rp'+id + ' > i').hide();
+														if(spatial !== null && spatial !== undefined) {
+															$('#sp' + id).slider({ min: 0, max: 100, step: 1, value: 50, handle: 'triangle', enabled: false });
+															$('#position').removeClass('hide').show();
+														}
+														$('#rp' + id + ' > i').hide();
 													}
 													if(muted === true || muted === "true")
-														$('#rp'+id + ' > i.abmuted').removeClass('hide').show();
+														$('#rp' + id + ' > i.abmuted').removeClass('hide').show();
 													else
-														$('#rp'+id + ' > i.abmuted').hide();
+														$('#rp' + id + ' > i.abmuted').hide();
 													if(setup === true || setup === "true")
-														$('#rp'+id + ' > i.absetup').hide();
+														$('#rp' + id + ' > i.absetup').hide();
 													else
-														$('#rp'+id + ' > i.absetup').removeClass('hide').show();
+														$('#rp' + id + ' > i.absetup').removeClass('hide').show();
+													if(spatial !== null && spatial !== undefined)
+														$('#sp' + id).slider('setValue', spatial);
 												}
 											}
 										} else if(event === "roomchanged") {
@@ -200,22 +221,34 @@ $(document).ready(function() {
 													var display = list[f]["display"];
 													var setup = list[f]["setup"];
 													var muted = list[f]["muted"];
+													var spatial = list[f]["spatial_position"];
 													Janus.debug("  >> [" + id + "] " + display + " (setup=" + setup + ", muted=" + muted + ")");
-													if($('#rp'+id).length === 0) {
+													if($('#rp' + id).length === 0) {
 														// Add to the participants list
-														$('#list').append('<li id="rp'+id+'" class="list-group-item">'+display+
+														var slider = '';
+														if(spatial !== null && spatial !== undefined)
+															slider = '<span>[L <input id="sp' + id + '" type="text" style="width: 10%;"/> R] </span>';
+														$('#list').append('<li id="rp' + id +'" class="list-group-item">' +
+															slider +
+															display +
 															' <i class="absetup fa fa-chain-broken"></i>' +
 															' <i class="abmuted fa fa-microphone-slash"></i></li>');
-														$('#rp'+id + ' > i').hide();
+														if(spatial !== null && spatial !== undefined) {
+															$('#sp' + id).slider({ min: 0, max: 100, step: 1, value: 50, handle: 'triangle', enabled: false });
+															$('#position').removeClass('hide').show();
+														}
+														$('#rp' + id + ' > i').hide();
 													}
 													if(muted === true || muted === "true")
-														$('#rp'+id + ' > i.abmuted').removeClass('hide').show();
+														$('#rp' + id + ' > i.abmuted').removeClass('hide').show();
 													else
-														$('#rp'+id + ' > i.abmuted').hide();
+														$('#rp' + id + ' > i.abmuted').hide();
 													if(setup === true || setup === "true")
-														$('#rp'+id + ' > i.absetup').hide();
+														$('#rp' + id + ' > i.absetup').hide();
 													else
-														$('#rp'+id + ' > i.absetup').removeClass('hide').show();
+														$('#rp' + id + ' > i.absetup').removeClass('hide').show();
+													if(spatial !== null && spatial !== undefined)
+														$('#sp' + id).slider('setValue', spatial);
 												}
 											}
 										} else if(event === "destroyed") {
@@ -233,22 +266,34 @@ $(document).ready(function() {
 													var display = list[f]["display"];
 													var setup = list[f]["setup"];
 													var muted = list[f]["muted"];
+													var spatial = list[f]["spatial_position"];
 													Janus.debug("  >> [" + id + "] " + display + " (setup=" + setup + ", muted=" + muted + ")");
-													if($('#rp'+id).length === 0) {
+													if($('#rp' + id).length === 0) {
 														// Add to the participants list
-														$('#list').append('<li id="rp'+id+'" class="list-group-item">'+display+
+														var slider = '';
+														if(spatial !== null && spatial !== undefined)
+															slider = '<span>[L <input id="sp' + id + '" type="text" style="width: 10%;"/> R] </span>';
+														$('#list').append('<li id="rp' + id +'" class="list-group-item">' +
+															slider +
+															display +
 															' <i class="absetup fa fa-chain-broken"></i>' +
 															' <i class="abmuted fa fa-microphone-slash"></i></li>');
-														$('#rp'+id + ' > i').hide();
+														if(spatial !== null && spatial !== undefined) {
+															$('#sp' + id).slider({ min: 0, max: 100, step: 1, value: 50, handle: 'triangle', enabled: false });
+															$('#position').removeClass('hide').show();
+														}
+														$('#rp' + id + ' > i').hide();
 													}
 													if(muted === true || muted === "true")
-														$('#rp'+id + ' > i.abmuted').removeClass('hide').show();
+														$('#rp' + id + ' > i.abmuted').removeClass('hide').show();
 													else
-														$('#rp'+id + ' > i.abmuted').hide();
+														$('#rp' + id + ' > i.abmuted').hide();
 													if(setup === true || setup === "true")
-														$('#rp'+id + ' > i.absetup').hide();
+														$('#rp' + id + ' > i.absetup').hide();
 													else
-														$('#rp'+id + ' > i.absetup').removeClass('hide').show();
+														$('#rp' + id + ' > i.absetup').removeClass('hide').show();
+													if(spatial !== null && spatial !== undefined)
+														$('#sp' + id).slider('setValue', spatial);
 												}
 											} else if(msg["error"]) {
 												if(msg["error_code"] === 485) {
@@ -306,7 +351,18 @@ $(document).ready(function() {
 												$('#toggleaudio').html("Unmute").removeClass("btn-danger").addClass("btn-success");
 											mixertest.send({ message: { request: "configure", muted: !audioenabled }});
 										}).removeClass('hide').show();
-
+									// Spatial position, if enabled
+									$('#position').click(
+										function() {
+											bootbox.prompt("Insert new spatial position: [0-100] (0=left, 50=center, 100=right)", function(result) {
+												var spatial = parseInt(result);
+												if(isNaN(spatial) || spatial < 0 || spatial > 100) {
+													bootbox.alert("Invalid value");
+													return;
+												}
+												mixertest.send({ message: { request: "configure", spatial_position: spatial }});
+											});
+										});
 								},
 								oncleanup: function() {
 									webrtcUp = false;
diff --git a/mainpage.dox b/mainpage.dox
index 6d9254725a..aff272ac64 100644
--- a/mainpage.dox
+++ b/mainpage.dox
@@ -89,7 +89,7 @@
  * - \b gengetopt: http://www.gnu.org/software/gengetopt/ (command line)
  * - \b Jansson: http://www.digip.org/jansson/ (JSON)
  * - \b libconfig: https://hyperrealm.github.io/libconfig/ (configuration files)
- * - \b libnice: https://libnice.freedesktop.org/ (ICE/STUN/TURN, at least v0.1.16 suggested, master recommended)
+ * - \b libnice: https://libnice.freedesktop.org/ (ICE/STUN/TURN, at least v0.1.16 suggested, v0.1.18 recommended)
  * - \b OpenSSL: http://www.openssl.org/ (DTLS, at least v1.0.1e)
  * - \b libsrtp: https://github.com/cisco/libsrtp (SRTP, at least v2.x suggested)
  * - \b usrsctp: http://code.google.com/p/sctp-refimpl/ (\c optional, Data Channels)
@@ -3745,7 +3745,7 @@ ldd janus | grep asan
  * - \b gengetopt: http://www.gnu.org/software/gengetopt/ (command line)
  * - \b Jansson: http://www.digip.org/jansson/ (JSON)
  * - \b libconfig: https://hyperrealm.github.io/libconfig/ (configuration files)
- * - \b libnice: https://libnice.freedesktop.org/ (ICE/STUN/TURN, at least v0.1.16 suggested, master recommended)
+ * - \b libnice: https://libnice.freedesktop.org/ (ICE/STUN/TURN, at least v0.1.16 suggested, v0.1.18 recommended)
  * - \b OpenSSL: http://www.openssl.org/ (DTLS, at least v1.0.1e)
  * - \b libsrtp: https://github.com/cisco/libsrtp (SRTP, at least v2.x suggested)
  * - \b usrsctp: http://code.google.com/p/sctp-refimpl/ (\c optional, Data Channels)
diff --git a/mutex.h b/mutex.h
index 652384a157..d661628fda 100644
--- a/mutex.h
+++ b/mutex.h
@@ -49,7 +49,13 @@ typedef pthread_cond_t janus_condition;
 /*! \brief Janus condition wait */
 #define janus_condition_wait(a, b) pthread_cond_wait(a, b);
 /*! \brief Janus condition timed wait */
-#define janus_condition_timedwait(a, b, c) pthread_cond_timedwait(a, b, c);
+#define janus_condition_wait_until(a, b, c) { \
+	const struct timespec jct = { \
+		.tv_sec = c / G_USEC_PER_SEC, \
+		.tv_nsec = (c % G_USEC_PER_SEC)*1000 \
+	}; \
+	pthread_cond_timedwait(a, b, &jct); \
+}
 /*! \brief Janus condition signal */
 #define janus_condition_signal(a) pthread_cond_signal(a);
 /*! \brief Janus condition broadcast */
diff --git a/plugins/janus_audiobridge.c b/plugins/janus_audiobridge.c
index 99f64f26bb..bb9eca75a8 100644
--- a/plugins/janus_audiobridge.c
+++ b/plugins/janus_audiobridge.c
@@ -32,6 +32,7 @@ room-<unique room ID>: {
 	secret = <optional password needed for manipulating (e.g. destroying) the room>
 	pin = <optional password needed for joining the room>
 	sampling_rate = <sampling rate> (e.g., 16000 for wideband mixing)
+	spatial_audio = true|false (if true, the mix will be stereo to spatially place users, default=false)
 	audiolevel_ext = true|false (whether the ssrc-audio-level RTP extension must be
 		negotiated/used or not for new joins, default=true)
 	audiolevel_event = true|false (whether to emit event to other users or not, default=false)
@@ -126,6 +127,7 @@ room-<unique room ID>: {
 	"is_private" : <true|false, whether the room should appear in a list request>,
 	"allowed" : [ array of string tokens users can use to join this room, optional],
 	"sampling_rate" : <sampling rate of the room, optional, 16000 by default>,
+	"spatial_audio" : <true|false, whether the mix should spatially place users, default=false>,
 	"audiolevel_ext" : <true|false, whether the ssrc-audio-level RTP extension must be negotiated for new joins, default=true>,
 	"audiolevel_event" : <true|false (whether to emit event to other users or not)>,
 	"audio_active_packets" : <number of packets with audio level (default=100, 2 seconds)>,
@@ -324,6 +326,7 @@ room-<unique room ID>: {
 			"description" : "<Name of the room>",
 			"pin_required" : <true|false, whether a PIN is required to join this room>,
 			"sampling_rate" : <sampling rate of the mixer>,
+			"spatial_audio" : <true|false, whether the mix has spatial audio (stereo)>,
 			"record" : <true|false, whether the room is being recorded>,
 			"num_participants" : <count of the participants>
 		},
@@ -357,6 +360,7 @@ room-<unique room ID>: {
 			"setup" : <true|false, whether user successfully negotiate a WebRTC PeerConnection or not>,
 			"muted" : <true|false, whether user is muted or not>,
 			"talking" : <true|false, whether user is talking or not (only if audio levels are used)>,
+			"spatial_position" : <in case spatial audio is used, the panning of this participant (0=left, 50=center, 100=right)>,
 		},
 		// Other participants
 	]
@@ -645,9 +649,12 @@ room-<unique room ID>: {
 	"prebuffer" : <number of packets to buffer before decoding this participant (default=room value, or DEFAULT_PREBUFFERING)>,
 	"quality" : <0-10, Opus-related complexity to use, the higher the value, the better the quality (but more CPU); optional, default is 4>,
 	"volume" : <percent value, <100 reduces volume, >100 increases volume; optional, default is 100 (no volume change)>,
+	"spatial_position" : <in case spatial audio is enabled for the room, panning of this participant (0=left, 50=center, 100=right)>,
 	"secret" : "<room management password; optional, if provided the user is an admin and can't be globally muted with mute_room>",
 	"audio_level_average" : "<if provided, overrides the room audio_level_average for this user; optional>",
-	"audio_active_packets" : "<if provided, overrides the room audio_active_packets for this user; optional>"
+	"audio_active_packets" : "<if provided, overrides the room audio_active_packets for this user; optional>",
+	"record": <true|false, whether to record this user's contribution to a .mjr file (mixer not involved),
+	"filename": "<basename of the file to record to, -audio.mjr will be added by the plugin>"
 }
 \endverbatim
  *
@@ -683,6 +690,7 @@ room-<unique room ID>: {
 	"prebuffer" : <new number of packets to buffer before decoding this participant (see "join" for more info)>,
 	"quality" : <new Opus-related complexity to use (see "join" for more info)>,
 	"volume" : <new volume percent value (see "join" for more info)>,
+	"spatial_position" : <in case spatial audio is enabled for the room, new panning of this participant (0=left, 50=center, 100=right)>,
 	"record": <true|false, whether to record this user's contribution to a .mjr file (mixer not involved),
 	"filename": "<basename of the file to record to, -audio.mjr will be added by the plugin>"
 }
@@ -778,7 +786,7 @@ room-<unique room ID>: {
 	"display" : "<display name to have in the room; optional>",
 	"token" : "<invitation token, in case the new room has an ACL; optional>",
 	"muted" : <true|false, whether to start unmuted or muted>,
-	"quality" : <0-10, Opus-related complexity to use, lower is higher quality; optional, default is 4>
+	"quality" : <0-10, Opus-related complexity to use, higher is higher quality; optional, default is 4>
 }
 \endverbatim
  *
@@ -992,6 +1000,7 @@ static struct janus_json_parameter create_parameters[] = {
 	{"allowed", JSON_ARRAY, 0},
 	{"sampling_rate", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"sampling", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},	/* We keep this to be backwards compatible */
+	{"spatial_audio", JANUS_JSON_BOOL, 0},
 	{"record", JANUS_JSON_BOOL, 0},
 	{"record_file", JSON_STRING, 0},
 	{"allow_rtp_participants", JANUS_JSON_BOOL, 0},
@@ -1029,8 +1038,11 @@ static struct janus_json_parameter join_parameters[] = {
 	{"prebuffer", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"quality", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"volume", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
+	{"spatial_position", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"audio_level_average", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"audio_active_packets", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
+	{"record", JANUS_JSON_BOOL, 0},
+	{"filename", JSON_STRING, 0},
 	{"generate_offer", JANUS_JSON_BOOL, 0},
 	{"rtp", JSON_OBJECT, 0},
 	{"secret", JSON_STRING, 0}
@@ -1047,6 +1059,7 @@ static struct janus_json_parameter configure_parameters[] = {
 	{"prebuffer", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"quality", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"volume", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
+	{"spatial_position", JSON_INTEGER, JANUS_JSON_PARAM_POSITIVE},
 	{"record", JANUS_JSON_BOOL, 0},
 	{"filename", JSON_STRING, 0},
 	{"display", JSON_STRING, 0},
@@ -1125,6 +1138,7 @@ typedef struct janus_audiobridge_room {
 	uint32_t room_ssrc;			/* SSRC we'll use for packets generated by the mixer */
 	gboolean is_private;		/* Whether this room is 'private' (as in hidden) or not */
 	uint32_t sampling_rate;		/* Sampling rate of the mix (e.g., 16000 for wideband; can be 8, 12, 16, 24 or 48kHz) */
+	gboolean spatial_audio;		/* Whether the mix will use spatial audio, using stereo */
 	gboolean audiolevel_ext;	/* Whether the ssrc-audio-level extension must be negotiated or not for new joins */
 	gboolean audiolevel_event;	/* Whether to emit event to other users about audiolevel */
 	uint default_prebuffering;	/* Number of packets to buffer before decoding each participant */
@@ -1356,6 +1370,8 @@ typedef struct janus_audiobridge_participant {
 	gboolean muted;			/* Whether this participant is muted */
 	int volume_gain;		/* Gain to apply to the input audio (in percentage) */
 	int opus_complexity;	/* Complexity to use in the encoder (by default, DEFAULT_COMPLEXITY) */
+	gboolean stereo;		/* Whether stereo will be used for spatial audio */
+	int spatial_position;	/* Panning of this participant in the mix */
 	/* RTP stuff */
 	GList *inbuf;			/* Incoming audio from this participant, as an ordered list of packets */
 	GAsyncQueue *outbuf;	/* Mixed audio for this participant */
@@ -1853,7 +1869,7 @@ static int janus_audiobridge_resample(int16_t *input, int input_num, int input_r
 /* Opus settings */
 #define	OPUS_SAMPLES	960
 #define	G711_SAMPLES	160
-#define	BUFFER_SAMPLES	OPUS_SAMPLES*6
+#define	BUFFER_SAMPLES	OPUS_SAMPLES*12
 #define DEFAULT_COMPLEXITY	4
 
 
@@ -1899,7 +1915,8 @@ static int janus_audiobridge_create_opus_encoder_if_needed(janus_audiobridge_roo
 	}
 
 	int error = 0;
-	audiobridge->rtp_encoder = opus_encoder_create(audiobridge->sampling_rate, 1, OPUS_APPLICATION_VOIP, &error);
+	audiobridge->rtp_encoder = opus_encoder_create(audiobridge->sampling_rate,
+		audiobridge->spatial_audio ? 2 : 1, OPUS_APPLICATION_VOIP, &error);
 	if(error != OPUS_OK) {
 		JANUS_LOG(LOG_ERR, "Error creating Opus encoder for RTP forwarder (room %s)\n", audiobridge->room_id_str);
 		return -1;
@@ -2204,6 +2221,7 @@ int janus_audiobridge_init(janus_callbacks *callback, const char *config_path) {
 			janus_config_item *desc = janus_config_get(config, cat, janus_config_type_item, "description");
 			janus_config_item *priv = janus_config_get(config, cat, janus_config_type_item, "is_private");
 			janus_config_item *sampling = janus_config_get(config, cat, janus_config_type_item, "sampling_rate");
+			janus_config_item *spatial = janus_config_get(config, cat, janus_config_type_item, "spatial_audio");
 			janus_config_item *audiolevel_ext = janus_config_get(config, cat, janus_config_type_item, "audiolevel_ext");
 			janus_config_item *audiolevel_event = janus_config_get(config, cat, janus_config_type_item, "audiolevel_event");
 			janus_config_item *audio_active_packets = janus_config_get(config, cat, janus_config_type_item, "audio_active_packets");
@@ -2275,6 +2293,7 @@ int janus_audiobridge_init(janus_callbacks *callback, const char *config_path) {
 					cl = cl->next;
 					continue;
 			}
+			audiobridge->spatial_audio = spatial && spatial->value && janus_is_true(spatial->value);
 			audiobridge->audiolevel_ext = TRUE;
 			if(audiolevel_ext != NULL && audiolevel_ext->value != NULL)
 				audiobridge->audiolevel_ext = janus_is_true(audiolevel_ext->value);
@@ -2568,6 +2587,8 @@ json_t *janus_audiobridge_query_session(janus_plugin_session *handle) {
 			json_object_set_new(info, "queue-out", json_integer(g_async_queue_length(participant->outbuf)));
 		if(participant->last_drop > 0)
 			json_object_set_new(info, "last-drop", json_integer(participant->last_drop));
+		if(participant->stereo)
+			json_object_set_new(info, "spatial_position", json_integer(participant->spatial_position));
 		if(participant->arc && participant->arc->filename)
 			json_object_set_new(info, "audio-recording", json_string(participant->arc->filename));
 		if(participant->extmap_id > 0) {
@@ -2651,6 +2672,7 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 		json_t *sampling = json_object_get(root, "sampling_rate");
 		if(sampling == NULL)
 			sampling = json_object_get(root, "sampling");
+		json_t *spatial = json_object_get(root, "spatial_audio");
 		json_t *audiolevel_ext = json_object_get(root, "audiolevel_ext");
 		json_t *audiolevel_event = json_object_get(root, "audiolevel_event");
 		json_t *audio_active_packets = json_object_get(root, "audio_active_packets");
@@ -2756,6 +2778,7 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 			audiobridge->sampling_rate = json_integer_value(sampling);
 		else
 			audiobridge->sampling_rate = 16000;
+		audiobridge->spatial_audio = spatial ? json_is_true(spatial) : FALSE;
 		audiobridge->audiolevel_ext = audiolevel_ext ? json_is_true(audiolevel_ext) : TRUE;
 		audiobridge->audiolevel_event = audiolevel_event ? json_is_true(audiolevel_event) : FALSE;
 		if(audiobridge->audiolevel_event) {
@@ -2904,6 +2927,8 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 				janus_config_add(config, c, janus_config_item_create("record", "yes"));
 				janus_config_add(config, c, janus_config_item_create("record_file", audiobridge->record_file));
 			}
+			if(audiobridge->spatial_audio)
+				janus_config_add(config, c, janus_config_item_create("spatial_audio", "yes"));
 			/* Save modified configuration */
 			if(janus_config_save(config, config_folder, JANUS_AUDIOBRIDGE_PACKAGE) < 0)
 				save = FALSE;	/* This will notify the user the room is not permanent */
@@ -3052,6 +3077,8 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 				janus_config_add(config, c, janus_config_item_create("record", "yes"));
 				janus_config_add(config, c, janus_config_item_create("record_file", audiobridge->record_file));
 			}
+			if(audiobridge->spatial_audio)
+				janus_config_add(config, c, janus_config_item_create("spatial_audio", "yes"));
 			/* Save modified configuration */
 			if(janus_config_save(config, config_folder, JANUS_AUDIOBRIDGE_PACKAGE) < 0)
 				save = FALSE;	/* This will notify the user the room changes are not permanent */
@@ -3240,6 +3267,7 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 			json_object_set_new(rl, "room", string_ids ? json_string(room->room_id_str) : json_integer(room->room_id));
 			json_object_set_new(rl, "description", json_string(room->room_name));
 			json_object_set_new(rl, "sampling_rate", json_integer(room->sampling_rate));
+			json_object_set_new(rl, "spatial_audio", room->spatial_audio ? json_true() : json_false());
 			json_object_set_new(rl, "pin_required", room->room_pin ? json_true() : json_false());
 			json_object_set_new(rl, "record", room->record ? json_true() : json_false());
 			json_object_set_new(rl, "muted", room->muted ? json_true() : json_false());
@@ -3532,6 +3560,8 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 				json_object_set_new(pl, "display", json_string(participant->display));
 			json_object_set_new(pl, "setup", g_atomic_int_get(&participant->session->started) ? json_true() : json_false());
 			json_object_set_new(pl, "muted", participant->muted ? json_true() : json_false());
+			if(audiobridge->spatial_audio)
+				json_object_set_new(pl, "spatial_position", json_integer(participant->spatial_position));
 			json_array_append_new(list, pl);
 			json_t *pub = json_object();
 			json_object_set_new(pub, "audiobridge", json_string("event"));
@@ -3834,6 +3864,8 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 			json_object_set_new(pl, "muted", p->muted ? json_true() : json_false());
 			if(p->extmap_id > 0)
 				json_object_set_new(pl, "talking", p->talking ? json_true() : json_false());
+			if(audiobridge->spatial_audio)
+				json_object_set_new(pl, "spatial_position", json_integer(p->spatial_position));
 			json_array_append_new(list, pl);
 		}
 		janus_refcount_decrease(&audiobridge->ref);
@@ -4330,7 +4362,10 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
 		p->annc->loop = json_is_true(json_object_get(root, "loop"));
 		/* Setup the opus decoder */
 		int opuserror = 0;
-		p->decoder = opus_decoder_create(audiobridge->sampling_rate, 1, &opuserror);
+		p->stereo = audiobridge->spatial_audio;
+		p->spatial_position = 50;
+		p->decoder = opus_decoder_create(audiobridge->sampling_rate,
+			audiobridge->spatial_audio ? 2 : 1, &opuserror);
 		if(opuserror != OPUS_OK) {
 			janus_mutex_unlock(&audiobridge->mutex);
 			janus_mutex_unlock(&rooms_mutex);
@@ -4760,6 +4795,8 @@ void janus_audiobridge_setup_media(janus_plugin_session *handle) {
 		json_object_set_new(pl, "display", json_string(participant->display));
 	json_object_set_new(pl, "setup", json_true());
 	json_object_set_new(pl, "muted", participant->muted ? json_true() : json_false());
+	if(audiobridge->spatial_audio)
+		json_object_set_new(pl, "spatial_position", json_integer(participant->spatial_position));
 	json_array_append_new(list, pl);
 	json_t *pub = json_object();
 	json_object_set_new(pub, "audiobridge", json_string("event"));
@@ -4800,14 +4837,14 @@ void janus_audiobridge_incoming_rtp(janus_plugin_session *handle, janus_plugin_r
 	uint16_t len = packet->length;
 	/* Save the frame if we're recording this leg */
 	janus_recorder_save_frame(participant->arc, buf, len);
-	if(g_atomic_int_get(&participant->active) && (participant->codec !=
-	JANUS_AUDIOCODEC_OPUS ||
+	if(g_atomic_int_get(&participant->active) && (participant->codec != JANUS_AUDIOCODEC_OPUS ||
 			(participant->codec == JANUS_AUDIOCODEC_OPUS && participant->decoder))) {
 		/* First of all, check if a reset on the decoder is due */
 		if(participant->reset && participant->codec == JANUS_AUDIOCODEC_OPUS) {
 			/* Create a new decoder and get rid of the old one */
 			int error = 0;
-			OpusDecoder *decoder = opus_decoder_create(participant->room->sampling_rate, 1, &error);
+			OpusDecoder *decoder = opus_decoder_create(participant->room->sampling_rate,
+				participant->stereo ? 2 : 1, &error);
 			if(error != OPUS_OK) {
 				JANUS_LOG(LOG_ERR, "Error resetting Opus decoder...\n");
 			} else {
@@ -5427,10 +5464,13 @@ static void *janus_audiobridge_handler(void *data) {
 			json_t *muted = json_object_get(root, "muted");
 			json_t *prebuffer = json_object_get(root, "prebuffer");
 			json_t *gain = json_object_get(root, "volume");
+			json_t *spatial = json_object_get(root, "spatial_position");
 			json_t *quality = json_object_get(root, "quality");
 			json_t *acodec = json_object_get(root, "codec");
 			json_t *user_audio_level_average = json_object_get(root, "audio_level_average");
 			json_t *user_audio_active_packets = json_object_get(root, "audio_active_packets");
+			json_t *record = json_object_get(root, "record");
+			json_t *recfile = json_object_get(root, "filename");
 			json_t *gen_offer = json_object_get(root, "generate_offer");
 			uint prebuffer_count = prebuffer ? json_integer_value(prebuffer) : audiobridge->default_prebuffering;
 			if(prebuffer_count > MAX_PREBUFFERING) {
@@ -5439,6 +5479,7 @@ static void *janus_audiobridge_handler(void *data) {
 					audiobridge->default_prebuffering);
 			}
 			int volume = gain ? json_integer_value(gain) : 100;
+			int spatial_position = spatial ? json_integer_value(spatial) : 50;
 			int complexity = quality ? json_integer_value(quality) : DEFAULT_COMPLEXITY;
 			if(complexity < 1 || complexity > 10) {
 				janus_mutex_unlock(&audiobridge->mutex);
@@ -5545,6 +5586,12 @@ static void *janus_audiobridge_handler(void *data) {
 			participant->prebuffer_count = prebuffer_count;
 			participant->volume_gain = volume;
 			participant->opus_complexity = complexity;
+			participant->stereo = audiobridge->spatial_audio;
+			if(participant->stereo) {
+				if(spatial_position > 100)
+					spatial_position = 100;
+				participant->spatial_position = spatial_position;
+			}
 			participant->user_audio_active_packets = json_integer_value(user_audio_active_packets);
 			participant->user_audio_level_average = json_integer_value(user_audio_level_average);
 			if(participant->outbuf == NULL)
@@ -5562,7 +5609,8 @@ static void *janus_audiobridge_handler(void *data) {
 			/* Opus encoder */
 			int error = 0;
 			if(participant->encoder == NULL) {
-				participant->encoder = opus_encoder_create(audiobridge->sampling_rate, 1, OPUS_APPLICATION_VOIP, &error);
+				participant->encoder = opus_encoder_create(audiobridge->sampling_rate,
+					audiobridge->spatial_audio ? 2 : 1, OPUS_APPLICATION_VOIP, &error);
 				if(error != OPUS_OK) {
 					if(user_id_allocated) {
 						g_free(user_id_str);
@@ -5598,7 +5646,8 @@ static void *janus_audiobridge_handler(void *data) {
 			if(participant->decoder == NULL) {
 				/* Opus decoder */
 				error = 0;
-				participant->decoder = opus_decoder_create(audiobridge->sampling_rate, 1, &error);
+				participant->decoder = opus_decoder_create(audiobridge->sampling_rate,
+					audiobridge->spatial_audio ? 2 : 1, &error);
 				if(error != OPUS_OK) {
 					if(user_id_allocated) {
 						g_free(user_id_str);
@@ -5621,6 +5670,46 @@ static void *janus_audiobridge_handler(void *data) {
 				}
 			}
 			participant->reset = FALSE;
+			/* Check if we need to record this participant right away */
+			if(record) {
+				janus_mutex_lock(&participant->rec_mutex);
+				if(json_is_true(record)) {
+					/* Start recording (ignore if recording already) */
+					if(participant->arc != NULL) {
+						JANUS_LOG(LOG_WARN, "Already recording participant's audio (room %s, user %s)\n",
+							participant->room->room_id_str, participant->user_id_str);
+					} else {
+						JANUS_LOG(LOG_INFO, "Starting recording of participant's audio (room %s, user %s)\n",
+							participant->room->room_id_str, participant->user_id_str);
+						char filename[255];
+						gint64 now = janus_get_real_time();
+						memset(filename, 0, 255);
+						const char *recording_base = json_string_value(recfile);
+						if(recording_base) {
+							/* Use the filename and path we have been provided */
+							g_snprintf(filename, 255, "%s-audio", recording_base);
+							participant->arc = janus_recorder_create(NULL, "opus", filename);
+							if(participant->arc == NULL) {
+								/* FIXME We should notify the fact the recorder could not be created */
+								JANUS_LOG(LOG_ERR, "Couldn't open an audio recording file for this participant!\n");
+							}
+						} else {
+							/* Build a filename */
+							g_snprintf(filename, 255, "audiobridge-%s-%s-%"SCNi64"-audio",
+								participant->room->room_id_str, participant->user_id_str, now);
+							participant->arc = janus_recorder_create(NULL, "opus", filename);
+							if(participant->arc == NULL) {
+								/* FIXME We should notify the fact the recorder could not be created */
+								JANUS_LOG(LOG_ERR, "Couldn't open an audio recording file for this participant!\n");
+							}
+						}
+					}
+				} else {
+					/* Stop recording (ignore if not recording) */
+					janus_audiobridge_recorder_close(participant);
+				}
+				janus_mutex_unlock(&participant->rec_mutex);
+			}
 			/* If this is a plain RTP participant, create the socket */
 			if(rtp != NULL) {
 				const char *ip = json_string_value(json_object_get(rtp, "ip"));
@@ -5737,6 +5826,8 @@ static void *janus_audiobridge_handler(void *data) {
 			/* Clarify we're still waiting for the user to negotiate a PeerConnection */
 			json_object_set_new(pl, "setup", json_false());
 			json_object_set_new(pl, "muted", participant->muted ? json_true() : json_false());
+			if(audiobridge->spatial_audio)
+				json_object_set_new(pl, "spatial_position", json_integer(participant->spatial_position));
 			json_array_append_new(newuserlist, pl);
 			json_object_set_new(newuser, "participants", newuserlist);
 			GHashTableIter iter;
@@ -5768,6 +5859,8 @@ static void *janus_audiobridge_handler(void *data) {
 				json_object_set_new(pl, "muted", p->muted ? json_true() : json_false());
 				if(p->extmap_id > 0)
 					json_object_set_new(pl, "talking", p->talking ? json_true() : json_false());
+				if(audiobridge->spatial_audio)
+					json_object_set_new(pl, "spatial_position", json_integer(p->spatial_position));
 				json_array_append_new(list, pl);
 			}
 			janus_mutex_unlock(&audiobridge->mutex);
@@ -5791,6 +5884,8 @@ static void *janus_audiobridge_handler(void *data) {
 				json_object_set_new(info, "display", json_string(participant->display));
 				json_object_set_new(info, "setup", g_atomic_int_get(&participant->session->started) ? json_true() : json_false());
 				json_object_set_new(info, "muted", participant->muted ? json_true() : json_false());
+				if(participant->stereo)
+					json_object_set_new(info, "spatial_position", json_integer(participant->spatial_position));
 				gateway->notify_event(&janus_audiobridge_plugin, session->handle, info);
 			}
 			if(user_id_allocated)
@@ -5819,6 +5914,7 @@ static void *janus_audiobridge_handler(void *data) {
 			json_t *prebuffer = json_object_get(root, "prebuffer");
 			json_t *quality = json_object_get(root, "quality");
 			json_t *gain = json_object_get(root, "volume");
+			json_t *spatial = json_object_get(root, "spatial_position");
 			json_t *record = json_object_get(root, "record");
 			json_t *recfile = json_object_get(root, "filename");
 			json_t *display = json_object_get(root, "display");
@@ -5864,7 +5960,7 @@ static void *janus_audiobridge_handler(void *data) {
 				if(participant->encoder)
 					opus_encoder_ctl(participant->encoder, OPUS_SET_COMPLEXITY(participant->opus_complexity));
 			}
-			if(muted || display) {
+			if(muted || display || (participant->stereo && spatial)) {
 				if(muted) {
 					participant->muted = json_is_true(muted);
 					JANUS_LOG(LOG_VERB, "Setting muted property: %s (room %s, user %s)\n",
@@ -5896,6 +5992,12 @@ static void *janus_audiobridge_handler(void *data) {
 					JANUS_LOG(LOG_VERB, "Setting display property: %s (room %s, user %s)\n",
 						participant->display, participant->room->room_id_str, participant->user_id_str);
 				}
+				if(participant->stereo && spatial) {
+					int spatial_position = json_integer_value(spatial);
+					if(spatial_position > 100)
+						spatial_position = 100;
+					participant->spatial_position = spatial_position;
+				}
 				/* Notify all other participants about the mute/unmute */
 				janus_mutex_lock(&rooms_mutex);
 				janus_audiobridge_room *audiobridge = participant->room;
@@ -5909,6 +6011,8 @@ static void *janus_audiobridge_handler(void *data) {
 						json_object_set_new(pl, "display", json_string(participant->display));
 					json_object_set_new(pl, "setup", g_atomic_int_get(&participant->session->started) ? json_true() : json_false());
 					json_object_set_new(pl, "muted", participant->muted ? json_true() : json_false());
+					if(audiobridge->spatial_audio)
+						json_object_set_new(pl, "spatial_position", json_integer(participant->spatial_position));
 					json_array_append_new(list, pl);
 					json_t *pub = json_object();
 					json_object_set_new(pub, "audiobridge", json_string("event"));
@@ -5992,6 +6096,8 @@ static void *janus_audiobridge_handler(void *data) {
 				json_object_set_new(info, "display", json_string(participant->display));
 				json_object_set_new(info, "muted", participant->muted ? json_true() : json_false());
 				json_object_set_new(info, "quality", json_integer(participant->opus_complexity));
+				if(participant->stereo)
+					json_object_set_new(info, "spatial_position", json_integer(participant->spatial_position));
 				gateway->notify_event(&janus_audiobridge_plugin, session->handle, info);
 			}
 			/* If we need to generate an offer ourselves, do that */
@@ -6101,8 +6207,10 @@ static void *janus_audiobridge_handler(void *data) {
 			const char *display_text = display ? json_string_value(display) : NULL;
 			json_t *muted = json_object_get(root, "muted");
 			json_t *gain = json_object_get(root, "volume");
+			json_t *spatial = json_object_get(root, "spatial_position");
 			json_t *quality = json_object_get(root, "quality");
 			int volume = gain ? json_integer_value(gain) : 100;
+			int spatial_position = spatial ? json_integer_value(spatial) : 64;
 			int complexity = quality ? json_integer_value(quality) : DEFAULT_COMPLEXITY;
 			if(complexity < 1 || complexity > 10) {
 				janus_mutex_unlock(&audiobridge->mutex);
@@ -6176,10 +6284,14 @@ static void *janus_audiobridge_handler(void *data) {
 			janus_mutex_lock(&old_audiobridge->mutex);
 			g_hash_table_remove(old_audiobridge->participants,
 				string_ids ? (gpointer)participant->user_id_str : (gpointer)&participant->user_id);
-			if(old_audiobridge->sampling_rate != audiobridge->sampling_rate) {
+			if(old_audiobridge->sampling_rate != audiobridge->sampling_rate ||
+					old_audiobridge->spatial_audio != audiobridge->spatial_audio) {
 				/* Create a new one that takes into account the sampling rate we want now */
+				participant->stereo = audiobridge->spatial_audio;
+				participant->spatial_position = 50;
 				int error = 0;
-				OpusEncoder *new_encoder = opus_encoder_create(audiobridge->sampling_rate, 1, OPUS_APPLICATION_VOIP, &error);
+				OpusEncoder *new_encoder = opus_encoder_create(audiobridge->sampling_rate,
+					audiobridge->spatial_audio ? 2 : 1, OPUS_APPLICATION_VOIP, &error);
 				if(error != OPUS_OK) {
 					if(user_id_allocated)
 						g_free(user_id_str);
@@ -6218,7 +6330,8 @@ static void *janus_audiobridge_handler(void *data) {
 				opus_encoder_ctl(new_encoder, OPUS_SET_COMPLEXITY(participant->opus_complexity));
 				/* Opus decoder */
 				error = 0;
-				OpusDecoder *new_decoder = opus_decoder_create(audiobridge->sampling_rate, 1, &error);
+				OpusDecoder *new_decoder = opus_decoder_create(audiobridge->sampling_rate,
+					audiobridge->spatial_audio ? 2 : 1, &error);
 				if(error != OPUS_OK) {
 					if(user_id_allocated)
 						g_free(user_id_str);
@@ -6300,6 +6413,12 @@ static void *janus_audiobridge_handler(void *data) {
 			participant->audio_dBov_sum = 0;
 			participant->talking = FALSE;
 			participant->volume_gain = volume;
+			participant->stereo = audiobridge->spatial_audio;
+			participant->spatial_position = spatial_position;
+			if(participant->spatial_position < 0)
+				participant->spatial_position = 0;
+			else if(participant->spatial_position > 100)
+				participant->spatial_position = 100;
 			if(quality) {
 				participant->opus_complexity = complexity;
 				if(participant->encoder)
@@ -6321,6 +6440,8 @@ static void *janus_audiobridge_handler(void *data) {
 				json_object_set_new(pl, "display", json_string(participant->display));
 			json_object_set_new(pl, "setup", g_atomic_int_get(&participant->session->started) ? json_true() : json_false());
 			json_object_set_new(pl, "muted", participant->muted ? json_true() : json_false());
+			if(audiobridge->spatial_audio)
+				json_object_set_new(pl, "spatial_position", json_integer(participant->spatial_position));
 			json_array_append_new(newuserlist, pl);
 			json_object_set_new(newuser, "participants", newuserlist);
 			g_hash_table_iter_init(&iter, audiobridge->participants);
@@ -6350,6 +6471,8 @@ static void *janus_audiobridge_handler(void *data) {
 				json_object_set_new(pl, "muted", p->muted ? json_true() : json_false());
 				if(p->extmap_id > 0)
 					json_object_set_new(pl, "talking", p->talking ? json_true() : json_false());
+				if(audiobridge->spatial_audio)
+					json_object_set_new(pl, "spatial_position", json_integer(p->spatial_position));
 				json_array_append_new(list, pl);
 			}
 			event = json_object();
@@ -6368,6 +6491,8 @@ static void *janus_audiobridge_handler(void *data) {
 					string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id));
 				json_object_set_new(info, "display", json_string(participant->display));
 				json_object_set_new(info, "muted", participant->muted ? json_true() : json_false());
+				if(participant->stereo)
+					json_object_set_new(info, "spatial_position", json_integer(participant->spatial_position));
 				gateway->notify_event(&janus_audiobridge_plugin, session->handle, info);
 			}
 			if(user_id_allocated)
@@ -6594,8 +6719,9 @@ static void *janus_audiobridge_handler(void *data) {
 			g_snprintf(s_name, sizeof(s_name), "AudioBridge %s", participant->room->room_id_str);
 			/* Prepare a fmtp string too */
 			char fmtp[100];
-			g_snprintf(fmtp, sizeof(fmtp), "%d maxplaybackrate=%"SCNu32"; stereo=0; sprop-stereo=0; useinbandfec=%d\r\n",
-				participant->opus_pt, participant->room->sampling_rate, participant->fec ? 1 : 0);
+			g_snprintf(fmtp, sizeof(fmtp), "%d maxplaybackrate=%"SCNu32"; stereo=%d; sprop-stereo=%d; useinbandfec=%d\r\n",
+				participant->opus_pt, participant->room->sampling_rate,
+				participant->stereo ? 1 : 0, participant->stereo ? 1 : 0, participant->fec ? 1 : 0);
 			/* If we got an offer, we need to answer */
 			janus_sdp *offer = NULL, *answer = NULL;
 			if(got_offer) {
@@ -6728,7 +6854,7 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 				{'f', 'm', 't', ' '},
 				16,
 				1,
-				1,
+				audiobridge->spatial_audio ? 2 : 1,
 				audiobridge->sampling_rate,
 				audiobridge->sampling_rate * 2,
 				2,
@@ -6746,12 +6872,16 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 
 	/* Buffer (we allocate assuming 48kHz, although we'll likely use less than that) */
 	int samples = audiobridge->sampling_rate/50;
-	opus_int32 buffer[OPUS_SAMPLES], sumBuffer[OPUS_SAMPLES];
-	opus_int16 outBuffer[OPUS_SAMPLES], resampled[OPUS_SAMPLES], *curBuffer = NULL;
-	memset(buffer, 0, OPUS_SAMPLES*4);
-	memset(sumBuffer, 0, OPUS_SAMPLES*4);
-	memset(outBuffer, 0, OPUS_SAMPLES*2);
-	memset(resampled, 0, OPUS_SAMPLES*2);
+	if(audiobridge->spatial_audio)
+		samples = samples*2;
+	opus_int32 buffer[audiobridge->spatial_audio ? OPUS_SAMPLES*2 : OPUS_SAMPLES],
+		sumBuffer[audiobridge->spatial_audio ? OPUS_SAMPLES*2 : OPUS_SAMPLES];
+	opus_int16 outBuffer[audiobridge->spatial_audio ? OPUS_SAMPLES*2 : OPUS_SAMPLES],
+		resampled[audiobridge->spatial_audio ? OPUS_SAMPLES*2 : OPUS_SAMPLES], *curBuffer = NULL;
+	memset(buffer, 0, OPUS_SAMPLES*(audiobridge->spatial_audio ? 8 : 4));
+	memset(sumBuffer, 0, OPUS_SAMPLES*(audiobridge->spatial_audio ? 8 : 4));
+	memset(outBuffer, 0, OPUS_SAMPLES*(audiobridge->spatial_audio ? 4 : 2));
+	memset(resampled, 0, OPUS_SAMPLES*(audiobridge->spatial_audio ? 4 : 2));
 
 	/* Base RTP packet, in case there are forwarders involved */
 	unsigned char *rtpbuffer = g_malloc0(1500);
@@ -6768,14 +6898,15 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 	time_t passed, d_s, d_us;
 
 	/* RTP */
-	gint16 seq = 0;
-	gint32 ts = 0;
+	guint16 seq = 0;
+	guint32 ts = 0;
 	/* SRTP buffer, if needed */
 	char sbuf[1500];
 
 	/* Loop */
 	int i=0;
 	int count = 0, rf_count = 0, pf_count = 0, prev_count = 0;
+	int lgain = 0, rgain = 0, diff = 0;
 	while(!g_atomic_int_get(&stopping) && !g_atomic_int_get(&audiobridge->destroyed)) {
 		/* See if it's time to prepare a frame */
 		gettimeofday(&now, NULL);
@@ -6861,11 +6992,48 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 					memcpy((opus_int16 *)pkt->data, resampled, pkt->length);
 				}
 				curBuffer = (opus_int16 *)pkt->data;
-				for(i=0; i<samples; i++) {
-					if(p->volume_gain == 100) {
-						buffer[i] += curBuffer[i];
-					} else {
-						buffer[i] += (curBuffer[i]*p->volume_gain)/100;
+				if(!p->stereo) {
+					for(i=0; i<samples; i++) {
+						if(p->volume_gain == 100) {
+							buffer[i] += curBuffer[i];
+						} else {
+							buffer[i] += (curBuffer[i]*p->volume_gain)/100;
+						}
+					}
+				} else {
+					diff = 50 - p->spatial_position;
+					lgain = 50 + diff;
+					rgain = 50 - diff;
+					for(i=0; i<samples; i++) {
+						if(i%2 == 0) {
+							if(lgain == 100) {
+								if(p->volume_gain == 100) {
+									buffer[i] += curBuffer[i];
+								} else {
+									buffer[i] += (curBuffer[i]*p->volume_gain)/100;
+								}
+							} else {
+								if(p->volume_gain == 100) {
+									buffer[i] += (curBuffer[i]*lgain)/100;
+								} else {
+									buffer[i] += (((curBuffer[i]*lgain)/100)*p->volume_gain)/100;
+								}
+							}
+						} else {
+							if(rgain == 100) {
+								if(p->volume_gain == 100) {
+									buffer[i] += curBuffer[i];
+								} else {
+									buffer[i] += (curBuffer[i]*p->volume_gain)/100;
+								}
+							} else {
+								if(p->volume_gain == 100) {
+									buffer[i] += (curBuffer[i]*rgain)/100;
+								} else {
+									buffer[i] += (((curBuffer[i]*rgain)/100)*p->volume_gain)/100;
+								}
+							}
+						}
 					}
 				}
 			}
@@ -6991,11 +7159,32 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 			}
 			janus_mutex_unlock(&p->qmutex);
 			curBuffer = (opus_int16 *)((pkt && pkt->length && !pkt->silence) ? pkt->data : NULL);
-			for(i=0; i<samples; i++) {
-				if(p->volume_gain == 100)
-					sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]) : 0);
-				else
-					sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]*p->volume_gain)/100 : 0);
+			if(!p->stereo) {
+				for(i=0; i<samples; i++) {
+					if(p->volume_gain == 100)
+						sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]) : 0);
+					else
+						sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]*p->volume_gain)/100 : 0);
+				}
+			} else {
+				diff = 50 - p->spatial_position;
+				lgain = 50 + diff;
+				rgain = 50 - diff;
+				for(i=0; i<samples; i++) {
+					if(i%2 == 0) {
+						if(lgain == 100) {
+							sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]) : 0);
+						} else {
+							sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]*lgain)/100 : 0);
+						}
+					} else {
+						if(rgain == 100) {
+							sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]) : 0);
+						} else {
+							sumBuffer[i] = buffer[i] - (curBuffer ? (curBuffer[i]*rgain)/100 : 0);
+						}
+					}
+				}
 			}
 			for(i=0; i<samples; i++)
 				/* FIXME Smoothen/Normalize instead of truncating? */
@@ -7067,7 +7256,8 @@ static void *janus_audiobridge_mixer_thread(void *data) {
 						continue;
 					if(forwarder->codec == JANUS_AUDIOCODEC_OPUS && !have_opus) {
 						/* This is an Opus forwarder and we don't have a version for that yet */
-						length = opus_encode(audiobridge->rtp_encoder, outBuffer, samples, rtpbuffer+12, 1500-12);
+						length = opus_encode(audiobridge->rtp_encoder, outBuffer,
+							audiobridge->spatial_audio ? samples/2 : samples, rtpbuffer+12, 1500-12);
 						if(length < 0) {
 							JANUS_LOG(LOG_ERR, "[Opus] Ops! got an error encoding the Opus frame: %d (%s)\n", length, opus_strerror(length));
 							continue;
@@ -7256,7 +7446,8 @@ static void *janus_audiobridge_participant_thread(void *data) {
 					g_atomic_int_compare_and_exchange(&participant->encoding, 0, 1)) {
 				/* Encode raw frame to Opus */
 				opus_int16 *outBuffer = (opus_int16 *)mixedpkt->data;
-				outpkt->length = opus_encode(participant->encoder, outBuffer, mixedpkt->length, payload+12, 1500-12);
+				outpkt->length = opus_encode(participant->encoder, outBuffer,
+					participant->stereo ? mixedpkt->length/2 : mixedpkt->length, payload+12, 1500-12);
 				g_atomic_int_set(&participant->encoding, 0);
 				if(outpkt->length < 0) {
 					JANUS_LOG(LOG_ERR, "[Opus] Ops! got an error encoding the Opus frame: %d (%s)\n", outpkt->length, opus_strerror(outpkt->length));
@@ -7480,7 +7671,7 @@ static void *janus_audiobridge_plainrtp_relay_thread(void *data) {
 				JANUS_LOG(LOG_ERR, "[AudioBridge-%p]   -- %d (%s)\n", session, error, strerror(error));
 				/* Can we assume it's pretty much over, after a POLLERR? */
 				goon = FALSE;
-				/* TODO Close the channel */
+				/* Close the channel */
 				janus_audiobridge_hangup_media(session->handle);
 				break;
 			} else if(fds[i].revents & POLLIN) {
@@ -7512,7 +7703,7 @@ static void *janus_audiobridge_plainrtp_relay_thread(void *data) {
 				rtp_header *header = (rtp_header *)buffer;
 				if(participant->plainrtp_media.audio_ssrc_peer != ntohl(header->ssrc)) {
 					participant->plainrtp_media.audio_ssrc_peer = ntohl(header->ssrc);
-					JANUS_LOG(LOG_VERB, "[AudioBridge-%p] Got SIP peer audio SSRC: %"SCNu32"\n",
+					JANUS_LOG(LOG_VERB, "[AudioBridge-%p] Got peer audio SSRC: %"SCNu32"\n",
 						session, participant->plainrtp_media.audio_ssrc_peer);
 				}
 				/* Check if the SSRC changed (e.g., after a re-INVITE or UPDATE) */
diff --git a/plugins/janus_echotest.c b/plugins/janus_echotest.c
index 5147149a9c..cba4ff750e 100644
--- a/plugins/janus_echotest.c
+++ b/plugins/janus_echotest.c
@@ -989,8 +989,10 @@ static void *janus_echotest_handler(void *data) {
 		}
 		if(substream) {
 			session->sim_context.substream_target = json_integer_value(substream);
-			JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
-				session->ssrc[session->sim_context.substream], session->sim_context.substream_target, session->sim_context.substream);
+			if(session->sim_context.substream_target >= 0 && session->sim_context.substream_target <= 2) {
+				JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
+					session->ssrc[session->sim_context.substream_target], session->sim_context.substream_target, session->sim_context.substream);
+			}
 			if(session->sim_context.substream_target == session->sim_context.substream) {
 				/* No need to do anything, we're already getting the right substream, so notify the user */
 				json_t *event = json_object();
diff --git a/plugins/janus_sip.c b/plugins/janus_sip.c
index afd4664053..36b1697f62 100644
--- a/plugins/janus_sip.c
+++ b/plugins/janus_sip.c
@@ -122,8 +122,9 @@
 	"headers" : "<array of key/value objects, to specify custom headers to add to the SIP REGISTER; optional>",
 	"contact_params" : "<array of key/value objects, to specify custom Contact URI params to add to the SIP REGISTER; optional>",
 	"incoming_header_prefixes" : "<array of strings, to specify custom (non-standard) headers to read on incoming SIP events; optional>",
-	"refresh" : <true|false; if true, only uses the SIP REGISTER as an update and not a new registration; optional>",
-	"master_id" : <ID of an already registered account, if this is an helper for multiple calls (more on that later); optional>
+	"refresh" : "<true|false; if true, only uses the SIP REGISTER as an update and not a new registration; optional>",
+	"master_id" : "<ID of an already registered account, if this is an helper for multiple calls (more on that later); optional>",
+ 	"register_ttl" : "<integer; number of seconds after which the registration should expire; optional>"
 }
 \endverbatim
  *
@@ -398,8 +399,7 @@
  *
 \verbatim
 {
-	"request" : "hold",
-	"direction" : "<sendonly, recvonly or inactive>"
+	"request" : "unhold"
 }
 \endverbatim
  *
@@ -473,9 +473,11 @@
 \verbatim
 {
 	"request" : "subscribe",
+	"call_id" : "<user-defined value of Call-ID SIP header used in all SIP requests throughout the subscription; optional>",
 	"event" : "<the event to subscribe to, e.g., 'message-summary'; mandatory>",
 	"accept" : "<what should be put in the Accept header; optional>",
-	"to" : "<who should be the SUBSCRIBE addressed to; optional, will use the user's identity if missing>"
+	"to" : "<who should be the SUBSCRIBE addressed to; optional, will use the user's identity if missing>",
+	"subscribe_ttl" : "<integer; number of seconds after which the subscription should expire; optional>"
 }
 \endverbatim
  *
@@ -486,6 +488,7 @@
 \verbatim
 {
 	"sip" : "event",
+	"call_id" : "<value of SIP Call-ID header for related subscription>",
 	"result" : {
 		"event" : "notify",
 		"notify" : "<name of the event that the user is subscribed to, e.g., 'message-summary'>",
@@ -747,12 +750,15 @@ static struct janus_json_parameter register_parameters[] = {
 	{"contact_params", JSON_OBJECT, 0},
 	{"master_id", JANUS_JSON_INTEGER, 0},
 	{"refresh", JANUS_JSON_BOOL, 0},
-	{"incoming_header_prefixes", JSON_ARRAY, 0}
+	{"incoming_header_prefixes", JSON_ARRAY, 0},
+	{"register_ttl", JANUS_JSON_INTEGER, 0}
 };
 static struct janus_json_parameter subscribe_parameters[] = {
 	{"to", JSON_STRING, 0},
 	{"event", JSON_STRING, JANUS_JSON_PARAM_REQUIRED},
-	{"accept", JSON_STRING, 0}
+	{"accept", JSON_STRING, 0},
+	{"subscribe_ttl", JANUS_JSON_INTEGER, 0},
+	{"call_id", JANUS_JSON_STRING, 0}
 };
 static struct janus_json_parameter proxy_parameters[] = {
 	{"proxy", JSON_STRING, 0},
@@ -824,6 +830,8 @@ static gboolean behind_nat = FALSE;
 static char *user_agent;
 #define JANUS_DEFAULT_REGISTER_TTL	3600
 static int register_ttl = JANUS_DEFAULT_REGISTER_TTL;
+#define JANUS_DEFAULT_SUBSCRIBE_TTL 3600
+static int subscribe_ttl = JANUS_DEFAULT_SUBSCRIBE_TTL;
 static uint16_t rtp_range_min = 10000;
 static uint16_t rtp_range_max = 60000;
 static int dscp_audio_rtp = 0;
@@ -3162,6 +3170,23 @@ static void *janus_sip_handler(void *data) {
 				to = session->account.identity;
 			const char *event_type = json_string_value(json_object_get(root, "event"));
 			const char *accept = json_string_value(json_object_get(root, "accept"));
+
+			/* TTL */
+			int ttl = subscribe_ttl;
+			json_t *sub_ttl = json_object_get(root, "subscribe_ttl");
+			if(sub_ttl && json_is_integer(sub_ttl))
+				ttl = json_integer_value(sub_ttl);
+			if(ttl <= 0)
+				ttl = JANUS_DEFAULT_SUBSCRIBE_TTL;
+			char ttl_text[20];
+			g_snprintf(ttl_text, sizeof(ttl_text), "%d", ttl);
+
+			/* Take call-id from request, if it exists */
+			char *callid = NULL;
+			json_t *request_callid = json_object_get(root, "call_id");
+			if (request_callid)
+				callid = json_string_value(request_callid);
+
 			/* Do we have a handle for this subscription already? */
 			janus_mutex_lock(&session->stack->smutex);
 			nua_handle_t *nh = NULL;
@@ -3208,12 +3233,16 @@ static void *janus_sip_handler(void *data) {
 			nua_subscribe(nh,
 				SIPTAG_TO_STR(to),
 				SIPTAG_EVENT_STR(event_type),
+				SIPTAG_CALL_ID_STR(callid),
 				SIPTAG_ACCEPT_STR(accept),
+				SIPTAG_EXPIRES_STR(ttl_text),
 				NUTAG_PROXY(session->helper && session->master ?
 					session->master->account.outbound_proxy : session->account.outbound_proxy),
 				TAG_END());
 			result = json_object();
 			json_object_set_new(result, "event", json_string("subscribing"));
+			if (callid)
+				json_object_set_new(result, "call_id", json_string(callid));
 		} else if(!strcasecmp(request_text, "unsubscribe")) {
 			/* Unsubscribe from some SIP events */
 			JANUS_VALIDATE_JSON_OBJECT(root, subscribe_parameters,
@@ -4899,7 +4928,7 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
 				char *callee_text = url_as_string(session->stack->s_home, sip->sip_to->a_url);
 				json_object_set_new(result, "callee", json_string(callee_text));
 				json_object_set_new(missed, "result", result);
-				json_object_set_new(missed, "call_id", json_string(session->callid));
+				json_object_set_new(missed, "callid", json_string(sip->sip_call_id->i_id));
 				int ret = gateway->push_event(session->handle, &janus_sip_plugin, session->transaction, missed, NULL);
 				JANUS_LOG(LOG_VERB, "  >> Pushing event to peer: %d (%s)\n", ret, janus_get_api_error(ret));
 				json_decref(missed);
@@ -5234,6 +5263,7 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
 			/* Notify the application */
 			json_t *notify = json_object();
 			json_object_set_new(notify, "sip", json_string("event"));
+			json_object_set_new(notify, "call_id", json_string(sip->sip_call_id->i_id));
 			json_t *result = json_object();
 			json_object_set_new(result, "event", json_string("notify"));
 			if(sip->sip_event != NULL)
@@ -5771,6 +5801,7 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
 				/* Success */
 				json_t *event = json_object();
 				json_object_set_new(event, "sip", json_string("event"));
+				json_object_set_new(event, "call_id", json_string(sip->sip_call_id->i_id));
 				json_t *result = json_object();
 				json_object_set_new(result, "event", json_string("subscribe_succeeded"));
 				json_object_set_new(result, "code", json_integer(status));
@@ -5778,6 +5809,8 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
 					json_t *headers = janus_sip_get_incoming_headers(sip, session);
 					json_object_set_new(result, "headers", headers);
 				}
+				if (sip->sip_expires)
+					json_object_set_new(result, "expires", json_integer(sip->sip_expires->ex_delta));
 				json_object_set_new(result, "reason", json_string(phrase ? phrase : ""));
 				json_object_set_new(event, "result", result);
 				int ret = gateway->push_event(session->handle, &janus_sip_plugin, session->transaction, event, NULL);
@@ -5840,6 +5873,7 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
 				JANUS_LOG(LOG_WARN, "[%s] SUBSCRIBE failed: %d %s\n", session->account.username, status, phrase ? phrase : "");
 				json_t *event = json_object();
 				json_object_set_new(event, "sip", json_string("event"));
+				json_object_set_new(event, "call_id", json_string(sip->sip_call_id->i_id));
 				json_t *result = json_object();
 				json_object_set_new(result, "event", json_string("subscribe_failed"));
 				json_object_set_new(result, "code", json_integer(status));
diff --git a/plugins/janus_streaming.c b/plugins/janus_streaming.c
index 0f748447ca..226db1952f 100644
--- a/plugins/janus_streaming.c
+++ b/plugins/janus_streaming.c
@@ -4173,8 +4173,11 @@ static json_t *janus_streaming_process_synchronous_request(janus_streaming_sessi
 			JANUS_VALIDATE_JSON_OBJECT(root, disable_parameters,
 				error_code, error_cause, TRUE,
 				JANUS_STREAMING_ERROR_MISSING_ELEMENT, JANUS_STREAMING_ERROR_INVALID_ELEMENT);
-			if(error_code != 0)
+			if(error_code != 0) {
+				janus_refcount_decrease(&mp->ref);
+				janus_mutex_unlock(&mountpoints_mutex);
 				goto prepare_response;
+			}
 			mp->enabled = FALSE;
 			gboolean stop_recording = TRUE;
 			json_t *stop_rec = json_object_get(root, "stop_recording");
diff --git a/plugins/janus_videocall.c b/plugins/janus_videocall.c
index 141b180448..dcd78cf97c 100644
--- a/plugins/janus_videocall.c
+++ b/plugins/janus_videocall.c
@@ -786,7 +786,7 @@ void janus_videocall_incoming_rtp(janus_plugin_session *handle, janus_plugin_rtp
 				json_t *result = json_object();
 				json_object_set_new(result, "event", json_string("simulcast"));
 				json_object_set_new(result, "videocodec", json_string(janus_videocodec_name(session->vcodec)));
-				json_object_set_new(result, "substream", json_integer(session->sim_context.substream));
+				json_object_set_new(result, "substream", json_integer(peer->sim_context.substream));
 				json_object_set_new(event, "result", result);
 				gateway->push_event(peer->handle, &janus_videocall_plugin, NULL, event, NULL);
 				json_decref(event);
@@ -798,7 +798,7 @@ void janus_videocall_incoming_rtp(janus_plugin_session *handle, janus_plugin_rtp
 				json_t *result = json_object();
 				json_object_set_new(result, "event", json_string("simulcast"));
 				json_object_set_new(result, "videocodec", json_string(janus_videocodec_name(session->vcodec)));
-				json_object_set_new(result, "temporal", json_integer(session->sim_context.templayer));
+				json_object_set_new(result, "temporal", json_integer(peer->sim_context.templayer));
 				json_object_set_new(event, "result", result);
 				gateway->push_event(peer->handle, &janus_videocall_plugin, NULL, event, NULL);
 				json_decref(event);
@@ -1357,21 +1357,13 @@ static void *janus_videocall_handler(void *data) {
 			/* Check if this user will simulcast */
 			json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
 			if(msg_simulcast && janus_get_codec_pt(msg_sdp, "vp8") > 0) {
-				JANUS_LOG(LOG_VERB, "VideoCall callee (%s) is going to do simulcasting\n", session->username);
-				session->ssrc[0] = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
-				session->ssrc[1] = json_integer_value(json_object_get(msg_simulcast, "ssrc-1"));
-				session->ssrc[2] = json_integer_value(json_object_get(msg_simulcast, "ssrc-2"));
+				JANUS_LOG(LOG_VERB, "VideoCall callee (%s) cannot do simulcast.\n", session->username);
 			} else {
 				int i=0;
 				for(i=0; i<3; i++) {
 					session->ssrc[i] = 0;
 					g_free(session->rid[0]);
 					session->rid[0] = NULL;
-					if(peer) {
-						peer->ssrc[i] = 0;
-						g_free(peer->rid[0]);
-						peer->rid[0] = NULL;
-					}
 				}
 			}
 			/* Check which codecs we ended up using */
@@ -1490,8 +1482,10 @@ static void *janus_videocall_handler(void *data) {
 			}
 			if(substream) {
 				session->sim_context.substream_target = json_integer_value(substream);
-				JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
-					session->ssrc[session->sim_context.substream], session->sim_context.substream_target, session->sim_context.substream);
+				if(session->sim_context.substream_target >= 0 && session->sim_context.substream_target <= 2) {
+					JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
+						session->ssrc[session->sim_context.substream_target], session->sim_context.substream_target, session->sim_context.substream);
+				}
 				if(session->sim_context.substream_target == session->sim_context.substream) {
 					/* No need to do anything, we're already getting the right substream, so notify the user */
 					json_t *event = json_object();
diff --git a/plugins/janus_videoroom.c b/plugins/janus_videoroom.c
index 1a49220f98..b72ba9206b 100644
--- a/plugins/janus_videoroom.c
+++ b/plugins/janus_videoroom.c
@@ -5145,10 +5145,13 @@ void janus_videoroom_setup_media(janus_plugin_session *handle) {
 			json_object_set_new(pub, "videoroom", json_string("event"));
 			json_object_set_new(pub, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id));
 			json_object_set_new(pub, "publishers", list);
-			if (participant->room) {
-				janus_mutex_lock(&participant->room->mutex);
+			janus_videoroom *room = participant->room;
+			if(room && !g_atomic_int_get(&room->destroyed)) {
+				janus_refcount_increase(&room->ref);
+				janus_mutex_lock(&room->mutex);
 				janus_videoroom_notify_participants(participant, pub, FALSE);
-				janus_mutex_unlock(&participant->room->mutex);
+				janus_mutex_unlock(&room->mutex);
+				janus_refcount_decrease(&room->ref);
 			}
 			json_decref(pub);
 			/* Also notify event handlers */
@@ -7019,10 +7022,12 @@ static void *janus_videoroom_handler(void *data) {
 					/* Check if a simulcasting-related request is involved */
 					if(sc_substream && (publisher->ssrc[0] != 0 || publisher->rid[0] != NULL)) {
 						subscriber->sim_context.substream_target = json_integer_value(sc_substream);
-						JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
-							publisher->ssrc[subscriber->sim_context.substream],
-							subscriber->sim_context.substream_target,
-							subscriber->sim_context.substream);
+						if(subscriber->sim_context.substream_target >= 0 && subscriber->sim_context.substream_target <= 2) {
+							JANUS_LOG(LOG_VERB, "Setting video SSRC to let through (simulcast): %"SCNu32" (index %d, was %d)\n",
+								publisher->ssrc[subscriber->sim_context.substream_target],
+								subscriber->sim_context.substream_target,
+								subscriber->sim_context.substream);
+						}
 						if(subscriber->sim_context.substream_target == subscriber->sim_context.substream) {
 							/* No need to do anything, we're already getting the right substream, so notify the user */
 							json_t *event = json_object();
diff --git a/postprocessing/pp-av1.c b/postprocessing/pp-av1.c
index b2139c7b60..8ad29c5db6 100644
--- a/postprocessing/pp-av1.c
+++ b/postprocessing/pp-av1.c
@@ -19,42 +19,13 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-
+#include "pp-avformat.h"
 #include "pp-av1.h"
 #include "../debug.h"
 
-
-#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
-	(LIBAVCODEC_VERSION_MAJOR > major || \
-	 (LIBAVCODEC_VERSION_MAJOR == major && \
-	  LIBAVCODEC_VERSION_MINOR >= minor))
-
-#if LIBAVCODEC_VER_AT_LEAST(51, 42)
-#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(56, 56)
-#ifndef CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-#endif
-#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
-#endif
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(57, 14)
-#define USE_CODECPAR
-#endif
-
-
 /* MP4 output */
 static AVFormatContext *fctx;
 static AVStream *vStream;
-#ifdef USE_CODECPAR
-static AVCodecContext *vEncoder;
-#endif
 static uint16_t max_width = 0, max_height = 0;
 int fps = 0;
 
@@ -65,98 +36,30 @@ int janus_pp_av1_create(char *destination, char *metadata, gboolean faststart) {
 #if !LIBAVCODEC_VER_AT_LEAST(57, 25)
 	JANUS_LOG(LOG_ERR, "This version of libavcodec doesn't support AV1...\n");
 	return -1;
-#endif
-	/* Setup FFmpeg */
-#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
-	av_register_all();
-#endif
-	/* Adjust logging to match the postprocessor's */
-	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
-		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
-			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
-				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
-					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
-						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
+#else
 	/* MP4 output */
-	fctx = avformat_alloc_context();
+	fctx = janus_pp_create_avformatcontext("mp4", metadata, destination);
 	if(fctx == NULL) {
 		JANUS_LOG(LOG_ERR, "Error allocating context\n");
 		return -1;
 	}
-	/* We save the metadata part as a comment (see #1189) */
-	if(metadata)
-		av_dict_set(&fctx->metadata, "comment", metadata, 0);
-	fctx->oformat = av_guess_format("mp4", NULL, NULL);
-	if(fctx->oformat == NULL) {
-		JANUS_LOG(LOG_ERR, "Error guessing format\n");
-		return -1;
-	}
-    char filename[1024];
-	snprintf(filename, sizeof(filename), "%s", destination);
-#ifdef USE_CODECPAR
-#if LIBAVCODEC_VER_AT_LEAST(57, 25)
-	AVCodec *codec = avcodec_find_encoder(AV_CODEC_ID_AV1);
-#else
-	if(!codec) {
-		/* Error opening video codec */
-		JANUS_LOG(LOG_ERR, "Encoder not available\n");
-		return -1;
-	}
-#endif
-	fctx->video_codec = codec;
-	fctx->oformat->video_codec = codec->id;
-	vStream = avformat_new_stream(fctx, codec);
-	vStream->id = fctx->nb_streams-1;
-	vEncoder = avcodec_alloc_context3(codec);
-	vEncoder->width = max_width;
-	vEncoder->height = max_height;
-	vEncoder->time_base = (AVRational){ 1, fps };
-	vEncoder->pix_fmt = AV_PIX_FMT_YUV420P;
-	vEncoder->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	vEncoder->strict_std_compliance = -2;
-	if(avcodec_open2(vEncoder, codec, NULL) < 0) {
-		/* Error opening video codec */
-		JANUS_LOG(LOG_ERR, "Encoder error\n");
-		return -1;
-	}
-	avcodec_parameters_from_context(vStream->codecpar, vEncoder);
-#else
-	vStream = avformat_new_stream(fctx, 0);
+
+	vStream = janus_pp_new_video_avstream(fctx, AV_CODEC_ID_AV1, max_width, max_height);
 	if(vStream == NULL) {
 		JANUS_LOG(LOG_ERR, "Error adding stream\n");
 		return -1;
 	}
-#if LIBAVCODEC_VER_AT_LEAST(53, 21)
-	avcodec_get_context_defaults3(vStream->codec, AVMEDIA_TYPE_VIDEO);
-#else
-	avcodec_get_context_defaults2(vStream->codec, AVMEDIA_TYPE_VIDEO);
-#endif
-#if LIBAVCODEC_VER_AT_LEAST(57, 25)
-	vStream->codec->codec_id = AV_CODEC_ID_AV1;
-#endif
-	vStream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	vStream->codec->time_base = (AVRational){1, fps};
-	vStream->time_base = (AVRational){1, 90000};
-	vStream->codec->width = max_width;
-	vStream->codec->height = max_height;
-	vStream->codec->pix_fmt = PIX_FMT_YUV420P;
-	//~ if (fctx->flags & AVFMT_GLOBALHEADER)
-		vStream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-#endif
+
 	AVDictionary *options = NULL;
 	if(faststart)
 		av_dict_set(&options, "movflags", "+faststart", 0);
 
-	int res = avio_open2(&fctx->pb, filename, AVIO_FLAG_WRITE, NULL, &options);
-	if(res < 0) {
-		JANUS_LOG(LOG_ERR, "Error opening file for output (%d)\n", res);
-		return -1;
-	}
 	if(avformat_write_header(fctx, &options) < 0) {
 		JANUS_LOG(LOG_ERR, "Error writing header\n");
 		return -1;
 	}
 	return 0;
+#endif
 }
 
 /* Helper to decode a leb128 integer  */
@@ -422,6 +325,7 @@ int janus_pp_av1_process(FILE *file, janus_pp_frame_packet *list, int *working)
 	int len = 0, frameLen = 0, total = 0, dataLen = 0;
 	int keyFrame = 0;
 	gboolean keyframe_found = FALSE;
+	AVPacket *packet = av_packet_alloc();
 
 	while(*working && tmp != NULL) {
 		keyFrame = 0;
@@ -542,21 +446,20 @@ int janus_pp_av1_process(FILE *file, janus_pp_frame_packet *list, int *working)
 			total += frameLen;
 			JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Saving frame: %d (tot=%d)\n", tmp->ts, frameLen, total);
 
-			AVPacket packet;
-			av_init_packet(&packet);
-			packet.stream_index = 0;
-			packet.data = received_frame;
-			packet.size = frameLen;
+			av_packet_unref(packet);
+			packet->stream_index = 0;
+			packet->data = received_frame;
+			packet->size = frameLen;
 			if(keyFrame)
-				packet.flags |= AV_PKT_FLAG_KEY;
+				packet->flags |= AV_PKT_FLAG_KEY;
 
 			/* First we save to the file... */
-			packet.dts = tmp->ts-list->ts;
-			packet.pts = tmp->ts-list->ts;
+			packet->dts = tmp->ts-list->ts;
+			packet->pts = tmp->ts-list->ts;
 			JANUS_LOG(LOG_HUGE, "%"SCNu64" - %"SCNu64" --> %"SCNu64"\n",
-				tmp->ts, list->ts, packet.pts);
+				tmp->ts, list->ts, packet->pts);
 			if(fctx) {
-				int res = av_write_frame(fctx, &packet);
+				int res = av_write_frame(fctx, packet);
 				if(res < 0) {
 					JANUS_LOG(LOG_ERR, "Error writing video frame to file... (error %d)\n", res);
 				}
@@ -564,6 +467,7 @@ int janus_pp_av1_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		}
 		tmp = tmp->next;
 	}
+	av_packet_free(&packet);
 	g_free(received_frame);
 	g_free(obu_data);
 	g_free(start);
@@ -572,23 +476,9 @@ int janus_pp_av1_process(FILE *file, janus_pp_frame_packet *list, int *working)
 
 /* Close MP4 file */
 void janus_pp_av1_close(void) {
-	if(fctx != NULL)
-		av_write_trailer(fctx);
-#ifdef USE_CODECPAR
-	if(vEncoder != NULL)
-		avcodec_close(vEncoder);
-#else
-	if(vStream != NULL && vStream->codec != NULL)
-		avcodec_close(vStream->codec);
-#endif
-	if(fctx != NULL && fctx->streams[0] != NULL) {
-#ifndef USE_CODECPAR
-		av_free(fctx->streams[0]->codec);
-#endif
-		av_free(fctx->streams[0]);
-	}
 	if(fctx != NULL) {
+		av_write_trailer(fctx);
 		avio_close(fctx->pb);
-		av_free(fctx);
+		avformat_free_context(fctx);
 	}
 }
diff --git a/postprocessing/pp-avformat.c b/postprocessing/pp-avformat.c
new file mode 100644
index 0000000000..6d13575a98
--- /dev/null
+++ b/postprocessing/pp-avformat.c
@@ -0,0 +1,92 @@
+/*! \file    pp-avformat.c
+ * \copyright GNU General Public License v3
+ *
+ * \ingroup postprocessing
+ * \ref postprocessing
+ */
+
+#include "pp-avformat.h"
+
+void janus_pp_setup_avformat(void) {
+	/* Setup FFmpeg */
+#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
+	av_register_all();
+#endif
+	/* Adjust logging to match the postprocessor's */
+	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
+		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
+			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
+				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
+					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
+						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
+
+}
+
+AVFormatContext *janus_pp_create_avformatcontext(const char *format, const char *metadata, const char *destination) {
+	janus_pp_setup_avformat();
+
+	AVFormatContext *ctx = avformat_alloc_context();
+	if(!ctx)
+		return NULL;
+
+	/* We save the metadata part as a comment (see #1189) */
+	if(metadata)
+		av_dict_set(&ctx->metadata, "comment", metadata, 0);
+
+	ctx->oformat = av_guess_format(format, NULL, NULL);
+        if(ctx->oformat == NULL) {
+		JANUS_LOG(LOG_ERR, "Error guessing format\n");
+		avformat_free_context(ctx);
+		return NULL;
+        }
+
+	int res = avio_open(&ctx->pb, destination, AVIO_FLAG_WRITE);
+	if(res < 0) {
+		JANUS_LOG(LOG_ERR, "Error opening file for output (%d)\n", res);
+		avformat_free_context(ctx);
+		return NULL;
+	}
+
+	return ctx;
+}
+
+AVStream *janus_pp_new_audio_avstream(AVFormatContext *fctx, int codec_id, int samplerate, int channels, const uint8_t *extradata, int size) {
+	AVStream *st = avformat_new_stream(fctx, NULL);
+	if(!st)
+		return NULL;
+
+#ifdef USE_CODECPAR
+	AVCodecParameters *c = st->codecpar;
+#else
+	AVCodecContext *c = st->codec;
+#endif
+	c->codec_id = codec_id;
+	c->codec_type = AVMEDIA_TYPE_AUDIO;
+	c->sample_rate = samplerate;
+	c->channels = channels;
+	if(extradata) {
+		c->extradata_size = size;
+		c->extradata = av_memdup(extradata, size);
+	}
+
+	return st;
+}
+
+AVStream *janus_pp_new_video_avstream(AVFormatContext *fctx, int codec_id, int width, int height) {
+	AVStream *st = avformat_new_stream(fctx, NULL);
+	if(!st)
+		return NULL;
+
+#ifdef USE_CODECPAR
+	AVCodecParameters *c = st->codecpar;
+#else
+	AVCodecContext *c = st->codec;
+#endif
+	c->codec_id = codec_id;
+	c->codec_type = AVMEDIA_TYPE_VIDEO;
+	c->width = width;
+	c->height = height;
+
+	return st;
+}
+
diff --git a/postprocessing/pp-avformat.h b/postprocessing/pp-avformat.h
new file mode 100644
index 0000000000..3107a976a5
--- /dev/null
+++ b/postprocessing/pp-avformat.h
@@ -0,0 +1,46 @@
+/*! \file    pp-avformat.h
+ * \copyright GNU General Public License v3
+ *
+ * \ingroup postprocessing
+ * \ref postprocessing
+ */
+
+#ifndef JANUS_PP_AVFORMAT
+#define JANUS_PP_AVFORMAT
+
+#include "../debug.h"
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+
+#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
+	(LIBAVCODEC_VERSION_MAJOR > major || \
+	 (LIBAVCODEC_VERSION_MAJOR == major && \
+	  LIBAVCODEC_VERSION_MINOR >= minor))
+
+#if LIBAVCODEC_VER_AT_LEAST(51, 42)
+#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
+#endif
+
+#if LIBAVCODEC_VER_AT_LEAST(56, 56)
+#ifndef CODEC_FLAG_GLOBAL_HEADER
+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
+#endif
+#ifndef FF_INPUT_BUFFER_PADDING_SIZE
+#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
+#endif
+#endif
+
+#if LIBAVCODEC_VER_AT_LEAST(57, 14)
+#define USE_CODECPAR
+#endif
+
+void janus_pp_setup_avformat(void);
+
+AVFormatContext *janus_pp_create_avformatcontext(const char *format, const char *metadata, const char *destination);
+
+AVStream *janus_pp_new_video_avstream(AVFormatContext *fctx, int codec_id, int width, int height);
+AVStream *janus_pp_new_audio_avstream(AVFormatContext *fctx, int codec_id, int samplerate, int channels, const uint8_t *extradata, int size);
+
+
+#endif
diff --git a/postprocessing/pp-g722.c b/postprocessing/pp-g722.c
index d85506e8fc..566a0d85a8 100644
--- a/postprocessing/pp-g722.c
+++ b/postprocessing/pp-g722.c
@@ -19,23 +19,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
 
+#include "pp-avformat.h"
 #include "pp-g722.h"
 #include "../debug.h"
 
-
-#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
-	(LIBAVCODEC_VERSION_MAJOR > major || \
-	 (LIBAVCODEC_VERSION_MAJOR == major && \
-	  LIBAVCODEC_VERSION_MINOR >= minor))
-
-#if LIBAVCODEC_VER_AT_LEAST(57, 14)
-#define USE_CODECPAR
-#endif
-
-
 /* G.722 decoder */
 static AVCodec *dec_codec;			/* FFmpeg decoding codec */
 static AVCodecContext *dec_ctx;		/* FFmpeg decoding context */
@@ -63,17 +51,7 @@ static FILE *wav_file = NULL;
 int janus_pp_g722_create(char *destination, char *metadata) {
 	if(destination == NULL)
 		return -1;
-	/* Setup FFmpeg */
-#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
-	av_register_all();
-#endif
-	/* Adjust logging to match the postprocessor's */
-	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
-		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
-			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
-				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
-					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
-						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
+	janus_pp_setup_avformat();
 	/* Create decoding context */
 #if LIBAVCODEC_VER_AT_LEAST(53, 21)
 	int codec = AV_CODEC_ID_ADPCM_G722;
@@ -192,10 +170,9 @@ int janus_pp_g722_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		JANUS_LOG(LOG_VERB, "Writing %d bytes out of %d (seq=%"SCNu16", step=%"SCNu16", ts=%"SCNu64", time=%"SCNu64"s)\n",
 			bytes, tmp->len, tmp->seq, diff, tmp->ts, (tmp->ts-list->ts)/8000);
 		/* Decode and save to wav */
-		AVPacket avpacket;
-		av_init_packet(&avpacket);
-		avpacket.data = (uint8_t *)buffer;
-		avpacket.size = bytes;
+		AVPacket *avpacket = av_packet_alloc();
+		avpacket->data = (uint8_t *)buffer;
+		avpacket->size = bytes;
 		int err = 0;
 #if LIBAVCODEC_VER_AT_LEAST(55,28)
 		AVFrame *frame = av_frame_alloc();
@@ -203,7 +180,7 @@ int janus_pp_g722_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		AVFrame *frame = avcodec_alloc_frame();
 #endif
 #ifdef USE_CODECPAR
-		err = avcodec_send_packet(dec_ctx, &avpacket);
+		err = avcodec_send_packet(dec_ctx, avpacket);
 		if(err < 0) {
 			JANUS_LOG(LOG_ERR, "Error decoding audio frame... (%d)\n", err);
 		} else {
@@ -212,7 +189,7 @@ int janus_pp_g722_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		if(err > -1) {
 #else
 		int got_frame = 0;
-		err = avcodec_decode_audio4(dec_ctx, frame, &got_frame, &avpacket);
+		err = avcodec_decode_audio4(dec_ctx, frame, &got_frame, avpacket);
 		if(err < 0 || !got_frame) {
 			JANUS_LOG(LOG_ERR, "Error decoding audio frame... (%d)\n", err);
 		} else {
@@ -233,6 +210,7 @@ int janus_pp_g722_process(FILE *file, janus_pp_frame_packet *list, int *working)
 #else
 		avcodec_free_frame(&frame);
 #endif
+		av_packet_free(&avpacket);
 		tmp = tmp->next;
 	}
 	g_free(buffer);
diff --git a/postprocessing/pp-h264.c b/postprocessing/pp-h264.c
index bd02cb32aa..b61454902d 100644
--- a/postprocessing/pp-h264.c
+++ b/postprocessing/pp-h264.c
@@ -19,36 +19,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-
+#include "pp-avformat.h"
 #include "pp-h264.h"
 #include "../debug.h"
 
-
-#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
-	(LIBAVCODEC_VERSION_MAJOR > major || \
-	 (LIBAVCODEC_VERSION_MAJOR == major && \
-	  LIBAVCODEC_VERSION_MINOR >= minor))
-
-#if LIBAVCODEC_VER_AT_LEAST(51, 42)
-#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(56, 56)
-#ifndef CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-#endif
-#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
-#endif
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(57, 14)
-#define USE_CODECPAR
-#endif
-
-
 /* MP4 output */
 static AVFormatContext *fctx;
 static AVStream *vStream;
@@ -61,17 +35,9 @@ static int max_width = 0, max_height = 0, fps = 0;
 int janus_pp_h264_create(char *destination, char *metadata, gboolean faststart) {
 	if(destination == NULL)
 		return -1;
-	/* Setup FFmpeg */
-#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
-	av_register_all();
-#endif
-	/* Adjust logging to match the postprocessor's */
-	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
-		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
-			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
-				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
-					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
-						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
+
+	janus_pp_setup_avformat();
+
 	/* MP4 output */
 	fctx = avformat_alloc_context();
 	if(fctx == NULL) {
@@ -365,6 +331,7 @@ int janus_pp_h264_process(FILE *file, janus_pp_frame_packet *list, int *working)
 	int len = 0, frameLen = 0;
 	int keyFrame = 0;
 	gboolean keyframe_found = FALSE;
+	AVPacket *packet = av_packet_alloc();
 
 	while(*working && tmp != NULL) {
 		keyFrame = 0;
@@ -487,21 +454,20 @@ int janus_pp_h264_process(FILE *file, janus_pp_frame_packet *list, int *working)
 			/* Save the frame */
 			memset(received_frame + frameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
-			AVPacket packet;
-			av_init_packet(&packet);
-			packet.stream_index = 0;
-			packet.data = received_frame;
-			packet.size = frameLen;
+			av_packet_unref(packet);
+			packet->stream_index = 0;
+			packet->data = received_frame;
+			packet->size = frameLen;
 			if(keyFrame)
-				packet.flags |= AV_PKT_FLAG_KEY;
+				packet->flags |= AV_PKT_FLAG_KEY;
 
 			/* First we save to the file... */
-			packet.dts = tmp->ts-list->ts;
-			packet.pts = tmp->ts-list->ts;
+			packet->dts = tmp->ts-list->ts;
+			packet->pts = tmp->ts-list->ts;
 			JANUS_LOG(LOG_HUGE, "%"SCNu64" - %"SCNu64" --> %"SCNu64"\n",
-				tmp->ts, list->ts, packet.pts);
+				tmp->ts, list->ts, packet->pts);
 			if(fctx) {
-				int res = av_write_frame(fctx, &packet);
+				int res = av_write_frame(fctx, packet);
 				if(res < 0) {
 					JANUS_LOG(LOG_ERR, "Error writing video frame to file... (error %d)\n", res);
 				}
@@ -509,6 +475,7 @@ int janus_pp_h264_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		}
 		tmp = tmp->next;
 	}
+	av_packet_free(&packet);
 	g_free(received_frame);
 	g_free(start);
 	return 0;
diff --git a/postprocessing/pp-h265.c b/postprocessing/pp-h265.c
index d12aee8bfa..1494dcf018 100644
--- a/postprocessing/pp-h265.c
+++ b/postprocessing/pp-h265.c
@@ -19,36 +19,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-
+#include "pp-avformat.h"
 #include "pp-h265.h"
 #include "../debug.h"
 
-
-#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
-	(LIBAVCODEC_VERSION_MAJOR > major || \
-	 (LIBAVCODEC_VERSION_MAJOR == major && \
-	  LIBAVCODEC_VERSION_MINOR >= minor))
-
-#if LIBAVCODEC_VER_AT_LEAST(51, 42)
-#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(56, 56)
-#ifndef CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-#endif
-#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
-#endif
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(57, 14)
-#define USE_CODECPAR
-#endif
-
-
 /* MP4 output */
 static AVFormatContext *fctx;
 static AVStream *vStream;
@@ -61,17 +35,9 @@ static int max_width = 0, max_height = 0, fps = 0;
 int janus_pp_h265_create(char *destination, char *metadata, gboolean faststart) {
 	if(destination == NULL)
 		return -1;
-	/* Setup FFmpeg */
-#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
-	av_register_all();
-#endif
-	/* Adjust logging to match the postprocessor's */
-	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
-		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
-			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
-				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
-					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
-						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
+
+	janus_pp_setup_avformat();
+
 	/* MP4 output */
 	fctx = avformat_alloc_context();
 	if(fctx == NULL) {
@@ -338,6 +304,63 @@ int janus_pp_h265_preprocess(FILE *file, janus_pp_frame_packet *list) {
 		} else if(type == 34) {
 			/* PPS */
 			JANUS_LOG(LOG_HUGE, "[PPS] %u/%u/%u/%u\n", fbit, type, lid, tid);
+		} else if(type == 48) {
+			/* AP */
+			JANUS_LOG(LOG_HUGE, "[AP] %u/%u/%u/%u\n", fbit, type, lid, tid);
+			uint8_t *end = (uint8_t*)prebuffer + len;
+			uint16_t payload_len;
+			for (uint8_t *p = (uint8_t*)prebuffer + 2; p < end - 2; p += payload_len) {
+				payload_len = (p[0] << 8 | p[1]);
+				p += 2;
+
+				uint16_t unit = 0;
+				memcpy(&unit, p, sizeof(uint16_t));
+				unit = ntohs(unit);
+				uint8_t fbit = (unit & 0x8000) >> 15;
+				uint8_t type = (unit & 0x7E00) >> 9;
+				uint8_t lid = (unit & 0x01F8) >> 3;
+				uint8_t tid = (unit & 0x0007);
+
+				switch(type) {
+					case 32:
+						JANUS_LOG(LOG_HUGE, "[VPS] %u/%u/%u/%u\n", fbit, type, lid, tid);
+						break;
+					case 33:
+						JANUS_LOG(LOG_HUGE, "[SPS] %u/%u/%u/%u\n", fbit, type, lid, tid);
+						/* Get rid of the Emulation Prevention code, if present */
+						int i = 0, j = 0, zeros = 0;
+						for(i=0; i<payload_len; i++) {
+							if(zeros == 2 && p[i] == 0x03) {
+								/* Found, get rid of it */
+								i++;
+								zeros = 0;
+							}
+							/* Update the content of the buffer as we go along */
+							p[j] = p[i];
+							if(p[i] == 0x00) {
+								/* Found a zero, may be part of a start code */
+								zeros++;
+							} else {
+								/* Not a zero, so not the beginning of a start code */
+								zeros = 0;
+							}
+							j++;
+						}
+						/* Parse to get width/height */
+						int width = 0, height = 0;
+						janus_pp_h265_parse_sps((char*)p, &width, &height);
+						if(width*height > max_width*max_height) {
+							max_width = width;
+							max_height = height;
+						}
+						break;
+					case 34:
+						JANUS_LOG(LOG_HUGE, "[PPS] %u/%u/%u/%u\n", fbit, type, lid, tid);
+						break;
+					default:
+						break;
+				}
+			}
 		} else if(type == 49) {
 			/* FU */
 			uint8_t fuh = prebuffer[2];
@@ -392,6 +415,7 @@ int janus_pp_h265_process(FILE *file, janus_pp_frame_packet *list, int *working)
 	int len = 0, frameLen = 0;
 	int keyFrame = 0;
 	gboolean keyframe_found = FALSE;
+	AVPacket *packet = av_packet_alloc();
 
 	while(*working && tmp != NULL) {
 		keyFrame = 0;
@@ -450,8 +474,38 @@ int janus_pp_h265_process(FILE *file, janus_pp_frame_packet *list, int *working)
 				memset(temp + 1, 0x00, 1);
 				memset(temp + 2, 0x01, 1);
 				frameLen += 3;
-			}
-			if(type == 49) {
+			} else if(type == 48) {
+				/* AP */
+				uint8_t *end = buffer + len;
+				uint16_t payload_len;
+				for (uint8_t *p = buffer + 2; p < end - 2; p += payload_len) {
+					payload_len = (p[0] << 8 | p[1]);
+					p += 2;
+					uint8_t *temp = received_frame + frameLen;
+					temp[0] = 0;
+					temp[1] = 0;
+					temp[2] = 1;
+					memcpy(temp + 3, p, payload_len);
+					switch(p[0] >> 1) {
+						case 32:
+						case 33:
+						case 34:
+							keyFrame = 1;
+							if(!keyframe_found) {
+								keyframe_found = TRUE;
+								JANUS_LOG(LOG_INFO, "First keyframe: %"SCNu64"\n", tmp->ts-list->ts);
+							}
+							break;
+						default:
+							break;
+					}
+					frameLen += 3 + payload_len;
+				}
+				if(tmp->next == NULL || tmp->next->ts > tmp->ts)
+					break;
+				tmp = tmp->next;
+				continue;
+			} else if(type == 49) {
 				/* Check if this is the beginning of the FU */
 				uint8_t fuh = *(buffer+2);
 				uint8_t startbit = (fuh & 0x80) >> 7;
@@ -490,21 +544,20 @@ int janus_pp_h265_process(FILE *file, janus_pp_frame_packet *list, int *working)
 			/* Save the frame */
 			memset(received_frame + frameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
-			AVPacket packet;
-			av_init_packet(&packet);
-			packet.stream_index = 0;
-			packet.data = received_frame;
-			packet.size = frameLen;
+			av_packet_unref(packet);
+			packet->stream_index = 0;
+			packet->data = received_frame;
+			packet->size = frameLen;
 			if(keyFrame)
-				packet.flags |= AV_PKT_FLAG_KEY;
+				packet->flags |= AV_PKT_FLAG_KEY;
 
 			/* First we save to the file... */
-			packet.dts = tmp->ts-list->ts;
-			packet.pts = tmp->ts-list->ts;
+			packet->dts = tmp->ts-list->ts;
+			packet->pts = tmp->ts-list->ts;
 			JANUS_LOG(LOG_HUGE, "%"SCNu64" - %"SCNu64" --> %"SCNu64"\n",
-				tmp->ts, list->ts, packet.pts);
+				tmp->ts, list->ts, packet->pts);
 			if(fctx) {
-				int res = av_write_frame(fctx, &packet);
+				int res = av_write_frame(fctx, packet);
 				if(res < 0) {
 					JANUS_LOG(LOG_ERR, "Error writing video frame to file... (error %d)\n", res);
 				}
@@ -512,6 +565,7 @@ int janus_pp_h265_process(FILE *file, janus_pp_frame_packet *list, int *working)
 		}
 		tmp = tmp->next;
 	}
+	av_packet_free(&packet);
 	g_free(received_frame);
 	g_free(start);
 	return 0;
diff --git a/postprocessing/pp-opus.c b/postprocessing/pp-opus.c
index 4eef9952e1..edf3b5ace5 100644
--- a/postprocessing/pp-opus.c
+++ b/postprocessing/pp-opus.c
@@ -19,51 +19,48 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <ogg/ogg.h>
-
+#include "pp-avformat.h"
 #include "pp-opus.h"
 #include "pp-opus-silence.h"
 #include "../debug.h"
 #include "../version.h"
 
+static AVFormatContext *fctx;
+static AVStream *vStream;
 
-/* OGG/Opus helpers */
-FILE *ogg_file = NULL;
-ogg_stream_state *stream = NULL;
+static const uint8_t opus_extradata[19] = {
+	'O', 'p', 'u', 's', 'H', 'e', 'a', 'd',
+	1, 2, 0, 0, 128, 187,
+	0, 0, 0, 0, 0,
+};
 
-void le32(unsigned char *p, int v);
-void le16(unsigned char *p, int v);
-ogg_packet *op_opushead(void);
-ogg_packet *op_opustags(char *metadata);
-ogg_packet *op_from_pkt(const unsigned char *pkt, int len);
-void op_free(ogg_packet *op);
-int ogg_write(void);
-int ogg_flush(void);
+int janus_pp_opus_create(char *destination, char *metadata) {
+	if(destination == NULL)
+		return -1;
 
+	/* WebM output */
+	fctx = janus_pp_create_avformatcontext("ogg", metadata, destination);
+	if(fctx == NULL) {
+		JANUS_LOG(LOG_ERR, "Error allocating context\n");
+		return -1;
+	}
 
-int janus_pp_opus_create(char *destination, char *metadata) {
-	stream = g_malloc0(sizeof(ogg_stream_state));
-	if(ogg_stream_init(stream, rand()) < 0) {
-		JANUS_LOG(LOG_ERR, "Couldn't initialize Ogg stream state\n");
+	vStream = janus_pp_new_audio_avstream(fctx, AV_CODEC_ID_OPUS, 48000, 2, opus_extradata, sizeof(opus_extradata));
+	if(vStream == NULL) {
+		JANUS_LOG(LOG_ERR, "Error adding stream\n");
 		return -1;
 	}
-	ogg_file = fopen(destination, "wb");
-	if(ogg_file == NULL) {
-		JANUS_LOG(LOG_ERR, "Couldn't open output file\n");
+
+	if(avformat_write_header(fctx, NULL) < 0) {
+		JANUS_LOG(LOG_ERR, "Error writing header\n");
 		return -1;
 	}
-	JANUS_LOG(LOG_INFO, "Writing .opus file header\n");
-	/* Write stream headers */
-	ogg_packet *op = op_opushead();
-	ogg_stream_packetin(stream, op);
-	op_free(op);
-	op = op_opustags(metadata);
-	ogg_stream_packetin(stream, op);
-	op_free(op);
-	ogg_flush();
 	return 0;
 }
 
+// It assumes ALL the packets are of the 20ms kind
+#define OPUS_PACKET_DURATION 48 * 20;
+
 int janus_pp_opus_process(FILE *file, janus_pp_frame_packet *list, int *working) {
 	if(!file || !list || !working)
 		return -1;
@@ -72,30 +69,38 @@ int janus_pp_opus_process(FILE *file, janus_pp_frame_packet *list, int *working)
 	int bytes = 0, len = 0, steps = 0, last_seq = 0;
 	uint64_t pos = 0, nextPos = 0;
 	uint8_t *buffer = g_malloc0(1500);
+	AVPacket *pkt = av_packet_alloc();
+	AVRational timebase = {1, 48000};
+
 	while(*working && tmp != NULL) {
 		if(tmp->prev != NULL && ((tmp->ts - tmp->prev->ts)/48/20 > 1)) {
 			JANUS_LOG(LOG_WARN, "Lost a packet here? (got seq %"SCNu16" after %"SCNu16", time ~%"SCNu64"s)\n",
 				tmp->seq, tmp->prev->seq, (tmp->ts-list->ts)/48000);
-			ogg_packet *op = op_from_pkt((const unsigned char *)opus_silence, sizeof(opus_silence));
 			/* use ts differ to insert silence packet */
 			int silence_count = (tmp->ts - tmp->prev->ts)/48/20 - 1;
 			pos = (tmp->prev->ts - list->ts) / 48 / 20 + 1;
 			JANUS_LOG(LOG_WARN, "[FILL] pos: %06"SCNu64", writing silences (count=%d)\n", pos, silence_count);
 			int i=0;
+			pos = tmp->prev->ts - list->ts;
 			for(i=0; i<silence_count; i++) {
-				pos = (tmp->prev->ts - list->ts) / 48 / 20 + i + 1;
+				pos += OPUS_PACKET_DURATION;
 				if(tmp->next != NULL)
-					nextPos = (tmp->next->ts - list->ts) / 48 / 20;
+					nextPos = tmp->next->ts - list->ts;
 				if(pos >= nextPos) {
-					JANUS_LOG(LOG_WARN, "[SKIP] pos: %06" SCNu64 ", skipping remaining silence\n", pos);
+					JANUS_LOG(LOG_WARN, "[SKIP] pos: %06" SCNu64 ", skipping remaining silence\n", pos / 48 / 20 + 1);
 					break;
 				}
-				op->granulepos = 960*(pos); /* FIXME: get this from the toc byte */
-				ogg_stream_packetin(stream, op);
-				ogg_write();
+				av_packet_unref(pkt);
+				pkt->stream_index = 0;
+				pkt->data = opus_silence;
+				pkt->size = sizeof(opus_silence);
+				pkt->pts = pkt->dts = av_rescale_q(pos, timebase, fctx->streams[0]->time_base);
+				pkt->duration = OPUS_PACKET_DURATION;
+
+				if(av_write_frame(fctx, pkt) < 0) {
+					JANUS_LOG(LOG_ERR, "Error writing audio frame to file...\n");
+				}
 			}
-			ogg_flush();
-			g_free(op);
 		}
 		if(tmp->drop) {
 			/* We marked this packet as one to drop, before */
@@ -128,176 +133,30 @@ int janus_pp_opus_process(FILE *file, janus_pp_frame_packet *list, int *working)
 			last_seq = tmp->seq;
 			steps++;
 		}
-		ogg_packet *op = op_from_pkt((const unsigned char *)buffer, bytes);
-		pos = (tmp->ts - list->ts) / 48 / 20 + 1;
 		JANUS_LOG(LOG_VERB, "pos: %06"SCNu64", writing %d bytes out of %d (seq=%"SCNu16", step=%"SCNu16", ts=%"SCNu64", time=%"SCNu64"s)\n",
 			pos, bytes, tmp->len, tmp->seq, diff, tmp->ts, (tmp->ts-list->ts)/48000);
-		op->granulepos = 960*(pos); /* FIXME: get this from the toc byte */
-		ogg_stream_packetin(stream, op);
-		g_free(op);
-		ogg_write();
-		ogg_flush();
+		av_packet_unref(pkt);
+		pkt->stream_index = 0;
+		pkt->data = buffer;
+		pkt->size = bytes;
+		pkt->pts = pkt->dts = av_rescale_q(tmp->ts - list->ts, timebase, fctx->streams[0]->time_base);
+		pkt->duration = OPUS_PACKET_DURATION;
+
+		if(av_write_frame(fctx, pkt) < 0) {
+			JANUS_LOG(LOG_ERR, "Error writing audio frame to file...\n");
+		}
+
 		tmp = tmp->next;
 	}
 	g_free(buffer);
+	av_packet_free(&pkt);
 	return 0;
 }
 
 void janus_pp_opus_close(void) {
-	ogg_flush();
-	if(ogg_file)
-		fclose(ogg_file);
-	ogg_file = NULL;
-	if(stream)
-		ogg_stream_destroy(stream);
-	stream = NULL;
-}
-
-
-/* OGG/Opus helpers */
-/* Write a little-endian 32 bit int to memory */
-void le32(unsigned char *p, int v) {
-	p[0] = v & 0xff;
-	p[1] = (v >> 8) & 0xff;
-	p[2] = (v >> 16) & 0xff;
-	p[3] = (v >> 24) & 0xff;
-}
-
-
-/* Write a little-endian 16 bit int to memory */
-void le16(unsigned char *p, int v) {
-	p[0] = v & 0xff;
-	p[1] = (v >> 8) & 0xff;
-}
-
-/* Manufacture a generic OpusHead packet */
-ogg_packet *op_opushead(void) {
-	int size = 19;
-	unsigned char *data = g_malloc(size);
-	ogg_packet *op = g_malloc(sizeof(*op));
-
-	memcpy(data, "OpusHead", 8);  /* identifier */
-	data[8] = 1;                  /* version */
-	data[9] = 2;                  /* channels */
-	le16(data+10, 0);             /* pre-skip */
-	le32(data + 12, 48000);       /* original sample rate */
-	le16(data + 16, 0);           /* gain */
-	data[18] = 0;                 /* channel mapping family */
-
-	op->packet = data;
-	op->bytes = size;
-	op->b_o_s = 1;
-	op->e_o_s = 0;
-	op->granulepos = 0;
-	op->packetno = 0;
-
-	return op;
-}
-
-/* Manufacture a generic OpusTags packet */
-ogg_packet *op_opustags(char *metadata) {
-	const char *identifier = "OpusTags";
-	const char *desc = "DESCRIPTION=";
-	char vendor[256];
-	g_snprintf(vendor, sizeof(vendor), "Janus post-processor %s", janus_version_string);
-	int size = strlen(identifier) + 4 + strlen(vendor) + 4;
-	int dlen = strlen(desc), mlen = metadata ? strlen(metadata) : 0;
-	if(mlen > 0)
-		size += (4+dlen+mlen);
-	unsigned char *data = g_malloc(size);
-	ogg_packet *op = g_malloc(sizeof(*op));
-
-	/* Write down the tags */
-	memcpy(data, identifier, 8);
-	le32(data + 8, strlen(vendor));
-	memcpy(data + 12, vendor, strlen(vendor));
-	le32(data + 12 + strlen(vendor), mlen > 0 ? 1 : 0);
-	/* Check if we have metadata to write down: we'll use the "DESCRIPTION" tag */
-	if(metadata && strlen(metadata) > 0) {
-		/* Add a single comment */
-		le32(data + 12 + strlen(vendor) + 4, dlen+mlen);
-		memcpy(data + 12 + strlen(vendor) + 8, desc, dlen);
-		memcpy(data + 12 + strlen(vendor) + 8 + dlen, metadata, mlen);
-	}
-
-	op->packet = data;
-	op->bytes = size;
-	op->b_o_s = 0;
-	op->e_o_s = 0;
-	op->granulepos = 0;
-	op->packetno = 1;
-
-	return op;
-}
-
-/* Allocate an ogg_packet */
-ogg_packet *op_from_pkt(const unsigned char *pkt, int len) {
-	ogg_packet *op = g_malloc(sizeof(*op));
-
-	op->packet = (unsigned char *)pkt;
-	op->bytes = len;
-	op->b_o_s = 0;
-	op->e_o_s = 0;
-	op->granulepos = 0;
-	op->packetno = 0;
-
-	return op;
-}
-
-/* Free a packet and its contents */
-void op_free(ogg_packet *op) {
-	if(op) {
-		if(op->packet) {
-			g_free(op->packet);
-		}
-		g_free(op);
-	}
-}
-
-/* Write out available ogg pages */
-int ogg_write(void) {
-	ogg_page page;
-	size_t written;
-
-	if(!stream || !ogg_file) {
-		return -1;
-	}
-
-	while (ogg_stream_pageout(stream, &page)) {
-		written = fwrite(page.header, 1, page.header_len, ogg_file);
-		if(written != (size_t)page.header_len) {
-			JANUS_LOG(LOG_ERR, "Error writing Ogg page header\n");
-			return -2;
-		}
-		written = fwrite(page.body, 1, page.body_len, ogg_file);
-		if(written != (size_t)page.body_len) {
-			JANUS_LOG(LOG_ERR, "Error writing Ogg page body\n");
-			return -3;
-		}
-	}
-	return 0;
-}
-
-/* Flush remaining ogg data */
-int ogg_flush(void) {
-	ogg_page page;
-	size_t written;
-
-	if(!stream || !ogg_file) {
-		return -1;
+	if(fctx != NULL) {
+                av_write_trailer(fctx);
+                avio_close(fctx->pb);
+                avformat_free_context(fctx);
 	}
-
-	while (ogg_stream_flush(stream, &page)) {
-		written = fwrite(page.header, 1, page.header_len, ogg_file);
-		if(written != (size_t)page.header_len) {
-			JANUS_LOG(LOG_ERR, "Error writing Ogg page header\n");
-			return -2;
-		}
-		written = fwrite(page.body, 1, page.body_len, ogg_file);
-		if(written != (size_t)page.body_len) {
-			JANUS_LOG(LOG_ERR, "Error writing Ogg page body\n");
-			return -3;
-		}
-	}
-	return 0;
 }
diff --git a/postprocessing/pp-webm.c b/postprocessing/pp-webm.c
index 17a394758f..9c4e0be486 100644
--- a/postprocessing/pp-webm.c
+++ b/postprocessing/pp-webm.c
@@ -19,13 +19,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-
+#include "pp-avformat.h"
 #include "pp-webm.h"
 #include "../debug.h"
 
-
 /* WebRTC stuff (VP8/VP9) */
 #if defined(__ppc__) || defined(__ppc64__)
 	# define swap2(d)  \
@@ -35,35 +32,10 @@
 	# define swap2(d) d
 #endif
 
-#define LIBAVCODEC_VER_AT_LEAST(major, minor) \
-	(LIBAVCODEC_VERSION_MAJOR > major || \
-	 (LIBAVCODEC_VERSION_MAJOR == major && \
-	  LIBAVCODEC_VERSION_MINOR >= minor))
-
-#if LIBAVCODEC_VER_AT_LEAST(51, 42)
-#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(56, 56)
-#ifndef CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-#endif
-#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
-#endif
-#endif
-
-#if LIBAVCODEC_VER_AT_LEAST(57, 14)
-#define USE_CODECPAR
-#endif
-
 
 /* WebM output */
 static AVFormatContext *fctx;
 static AVStream *vStream;
-#ifdef USE_CODECPAR
-static AVCodecContext *vEncoder;
-#endif
 static int max_width = 0, max_height = 0, fps = 0;
 
 int janus_pp_webm_create(char *destination, char *metadata, gboolean vp8) {
@@ -75,92 +47,30 @@ int janus_pp_webm_create(char *destination, char *metadata, gboolean vp8) {
 		return -1;
 	}
 #endif
-	/* Setup FFmpeg */
-#if ( LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100) )
-	av_register_all();
-#endif
-	/* Adjust logging to match the postprocessor's */
-	av_log_set_level(janus_log_level <= LOG_NONE ? AV_LOG_QUIET :
-		(janus_log_level == LOG_FATAL ? AV_LOG_FATAL :
-			(janus_log_level == LOG_ERR ? AV_LOG_ERROR :
-				(janus_log_level == LOG_WARN ? AV_LOG_WARNING :
-					(janus_log_level == LOG_INFO ? AV_LOG_INFO :
-						(janus_log_level == LOG_VERB ? AV_LOG_VERBOSE : AV_LOG_DEBUG))))));
 	/* WebM output */
-	fctx = avformat_alloc_context();
+	fctx = janus_pp_create_avformatcontext("webm", metadata, destination);
 	if(fctx == NULL) {
 		JANUS_LOG(LOG_ERR, "Error allocating context\n");
 		return -1;
 	}
-	/* We save the metadata part as a comment (see #1189) */
-	if(metadata)
-		av_dict_set(&fctx->metadata, "comment", metadata, 0);
-	fctx->oformat = av_guess_format("webm", NULL, NULL);
-	if(fctx->oformat == NULL) {
-		JANUS_LOG(LOG_ERR, "Error guessing format\n");
-		return -1;
-	}
-    char filename[1024];
-	snprintf(filename, sizeof(filename), "%s", destination);
-#ifdef USE_CODECPAR
-	AVCodec *codec = avcodec_find_encoder(vp8 ? AV_CODEC_ID_VP8 : AV_CODEC_ID_VP9);
-	if(!codec) {
-		/* Error opening video codec */
-		JANUS_LOG(LOG_ERR, "Encoder not available\n");
-		return -1;
-	}
-	fctx->video_codec = codec;
-	fctx->oformat->video_codec = codec->id;
-	vStream = avformat_new_stream(fctx, codec);
-	vStream->id = fctx->nb_streams-1;
-	vEncoder = avcodec_alloc_context3(codec);
-	vEncoder->width = max_width;
-	vEncoder->height = max_height;
-	vEncoder->time_base = (AVRational){ 1, fps };
-	vEncoder->pix_fmt = AV_PIX_FMT_YUV420P;
-	vEncoder->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	if(avcodec_open2(vEncoder, codec, NULL) < 0) {
-		/* Error opening video codec */
-		JANUS_LOG(LOG_ERR, "Encoder error\n");
-		return -1;
-	}
-	avcodec_parameters_from_context(vStream->codecpar, vEncoder);
-#else
-	//~ vStream = av_new_stream(fctx, 0);
-	vStream = avformat_new_stream(fctx, 0);
-	if(vStream == NULL) {
-		JANUS_LOG(LOG_ERR, "Error adding stream\n");
-		return -1;
-	}
-	//~ avcodec_get_context_defaults2(vStream->codec, CODEC_TYPE_VIDEO);
-#if LIBAVCODEC_VER_AT_LEAST(53, 21)
-	avcodec_get_context_defaults3(vStream->codec, AVMEDIA_TYPE_VIDEO);
-#else
-	avcodec_get_context_defaults2(vStream->codec, AVMEDIA_TYPE_VIDEO);
-#endif
+
+	int codec_id;
 #if LIBAVCODEC_VER_AT_LEAST(54, 25)
 	#if LIBAVCODEC_VERSION_MAJOR >= 55
-	vStream->codec->codec_id = vp8 ? AV_CODEC_ID_VP8 : AV_CODEC_ID_VP9;
+	codec_id = vp8 ? AV_CODEC_ID_VP8 : AV_CODEC_ID_VP9;
 	#else
-	vStream->codec->codec_id = AV_CODEC_ID_VP8;
+	codec_id = AV_CODEC_ID_VP8;
 	#endif
 #else
-	vStream->codec->codec_id = CODEC_ID_VP8;
+	codec_id = CODEC_ID_VP8;
 #endif
-	//~ vStream->codec->codec_type = CODEC_TYPE_VIDEO;
-	vStream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	vStream->codec->time_base = (AVRational){1, fps};
-	vStream->codec->width = max_width;
-	vStream->codec->height = max_height;
-	vStream->codec->pix_fmt = PIX_FMT_YUV420P;
-	if (fctx->flags & AVFMT_GLOBALHEADER)
-		vStream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-#endif
-	int res = avio_open(&fctx->pb, filename, AVIO_FLAG_WRITE);
-	if(res < 0) {
-		JANUS_LOG(LOG_ERR, "Error opening file for output (%d)\n", res);
+
+	vStream = janus_pp_new_video_avstream(fctx, codec_id, max_width, max_height);
+	if(vStream == NULL) {
+		JANUS_LOG(LOG_ERR, "Error adding stream\n");
 		return -1;
 	}
+
 	if(avformat_write_header(fctx, NULL) < 0) {
 		JANUS_LOG(LOG_ERR, "Error writing header\n");
 		return -1;
@@ -374,6 +284,7 @@ int janus_pp_webm_process(FILE *file, janus_pp_frame_packet *list, gboolean vp8,
 	int len = 0, frameLen = 0;
 	int keyFrame = 0;
 	gboolean keyframe_found = FALSE;
+	AVPacket *packet = av_packet_alloc();
 
 	while(*working && tmp != NULL) {
 		keyFrame = 0;
@@ -609,28 +520,28 @@ int janus_pp_webm_process(FILE *file, janus_pp_frame_packet *list, gboolean vp8,
 		if(frameLen > 0) {
 			memset(received_frame + frameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
-			AVPacket packet;
-			av_init_packet(&packet);
-			packet.stream_index = 0;
-			packet.data = received_frame;
-			packet.size = frameLen;
+			av_packet_unref(packet);
+			packet->stream_index = 0;
+			packet->data = received_frame;
+			packet->size = frameLen;
 			if(keyFrame)
 				//~ packet.flags |= PKT_FLAG_KEY;
-				packet.flags |= AV_PKT_FLAG_KEY;
+				packet->flags |= AV_PKT_FLAG_KEY;
 
 			/* First we save to the file... */
 			//~ packet.dts = AV_NOPTS_VALUE;
 			//~ packet.pts = AV_NOPTS_VALUE;
-			packet.dts = (tmp->ts-list->ts)/90;
-			packet.pts = (tmp->ts-list->ts)/90;
+			packet->dts = (tmp->ts-list->ts)/90;
+			packet->pts = (tmp->ts-list->ts)/90;
 			if(fctx) {
-				if(av_write_frame(fctx, &packet) < 0) {
+				if(av_write_frame(fctx, packet) < 0) {
 					JANUS_LOG(LOG_ERR, "Error writing video frame to file...\n");
 				}
 			}
 		}
 		tmp = tmp->next;
 	}
+	av_packet_free(&packet);
 	g_free(received_frame);
 	g_free(start);
 	return 0;
@@ -638,24 +549,9 @@ int janus_pp_webm_process(FILE *file, janus_pp_frame_packet *list, gboolean vp8,
 
 /* Close WebM file */
 void janus_pp_webm_close(void) {
-	if(fctx != NULL)
-		av_write_trailer(fctx);
-#ifdef USE_CODECPAR
-	if(vEncoder != NULL)
-		avcodec_close(vEncoder);
-#else
-	if(vStream != NULL && vStream->codec != NULL)
-		avcodec_close(vStream->codec);
-#endif
-	if(fctx != NULL && fctx->streams[0] != NULL) {
-#ifndef USE_CODECPAR
-		av_free(fctx->streams[0]->codec);
-#endif
-		av_free(fctx->streams[0]);
-	}
 	if(fctx != NULL) {
-		//~ url_fclose(fctx->pb);
+		av_write_trailer(fctx);
 		avio_close(fctx->pb);
-		av_free(fctx);
+		avformat_free_context(fctx);
 	}
 }
diff --git a/rtcp.c b/rtcp.c
index b1283b43d8..2b28966dcf 100644
--- a/rtcp.c
+++ b/rtcp.c
@@ -268,9 +268,9 @@ static void janus_rtcp_incoming_transport_cc(janus_rtcp_context *ctx, janus_rtcp
 		} else {
 			/* Status vector */
 			ss = (chunk & 0x4000) >> 14;
-			length = (s ? 7 : 14);
-			JANUS_LOG(LOG_HUGE, "  [%"SCNu16"] t=status-vector, ss=%s, l=%"SCNu8"\n", num,
-				s ? "2-bit" : "bit", length);
+			length = (ss ? 7 : 14);
+			JANUS_LOG(LOG_HUGE, "  [%"SCNu16"] t=status-vector, ss=%ss, l=%"SCNu8"\n", num,
+				ss ? "2-bit" : "bit", length);
 			while(length > 0 && psc > 0) {
 				if(!ss)
 					s = (chunk & (1 << (length-1))) ? janus_rtp_packet_status_smalldelta : janus_rtp_packet_status_notreceived;
diff --git a/transports/janus_mqtt.c b/transports/janus_mqtt.c
index b3ad74f735..547a056bab 100644
--- a/transports/janus_mqtt.c
+++ b/transports/janus_mqtt.c
@@ -1373,7 +1373,7 @@ void janus_mqtt_client_disconnect_failure_impl(void *context, int rc) {
 	JANUS_LOG(LOG_ERR, "Can't disconnect from MQTT broker, return code: %d\n", rc);
 	janus_mqtt_context *ctx = (janus_mqtt_context *)context;
 	janus_mutex_lock(&ctx->disconnect.mutex);
-	g_cond_signal(&ctx->disconnect.cond);
+	janus_condition_signal(&ctx->disconnect.cond);
 	janus_mutex_unlock(&ctx->disconnect.mutex);
 }
 
diff --git a/transports/janus_rabbitmq.c b/transports/janus_rabbitmq.c
index 5e93f8fa04..06fc2e2c6e 100644
--- a/transports/janus_rabbitmq.c
+++ b/transports/janus_rabbitmq.c
@@ -33,10 +33,18 @@
 
 #include "transport.h"
 
+/* Latest RabbitMQ-C library changes the library paths from 0.12.0.0 onwards */
+#ifdef HAVE_RABBITMQ_C_AMQP_H
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/framing.h>
+#include <rabbitmq-c/tcp_socket.h>
+#include <rabbitmq-c/ssl_socket.h>
+#else
 #include <amqp.h>
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
+#endif
 
 #include "../debug.h"
 #include "../apierror.h"
@@ -72,6 +80,8 @@ void janus_rabbitmq_session_over(janus_transport_session *transport, guint64 ses
 void janus_rabbitmq_session_claimed(janus_transport_session *transport, guint64 session_id);
 json_t *janus_rabbitmq_query_transport(json_t *request);
 
+/* Internal methods */
+static int janus_rabbitmq_connect(void);
 
 /* Transport setup */
 static janus_transport janus_rabbitmq_transport =
@@ -111,6 +121,9 @@ static janus_transport_callbacks *gateway = NULL;
 static gboolean rmq_janus_api_enabled = FALSE;
 static gboolean rmq_admin_api_enabled = FALSE;
 static gboolean notify_events = TRUE;
+static guint rmq_reconnect_backoff_initial = 100000; /* 100ms */
+static guint rmq_reconnect_backoff_max = 5000000; /* 5s */
+static gfloat rmq_reconnect_backoff_multiplier = 1.5;
 
 #define JANUS_RABBITMQ_EXCHANGE_TYPE "fanout"
 
@@ -146,6 +159,7 @@ typedef struct janus_rabbitmq_client {
 	janus_mutex mutex;						/* Mutex to lock/unlock this session */
 	gint session_timeout:1;					/* Whether a Janus session timeout occurred in the core */
 	gint destroy:1;							/* Flag to trigger a lazy session destruction */
+	gint connected:1;							/* Flag to specify whether or not RabbitMQ connection is deemed to be up */
 } janus_rabbitmq_client;
 
 /* RabbitMQ response */
@@ -170,6 +184,12 @@ static char *rmqhost = NULL, *vhost = NULL, *username = NULL, *password = NULL,
 	*ssl_cacert_file = NULL, *ssl_cert_file = NULL, *ssl_key_file = NULL,
 	*to_janus = NULL, *from_janus = NULL, *to_janus_admin = NULL, *from_janus_admin = NULL, *janus_exchange = NULL, *janus_exchange_type = NULL,
 	*queue_name = NULL, *queue_name_admin = NULL;
+static uint16_t rmqport = AMQP_PROTOCOL_PORT;
+static gboolean ssl_enabled = FALSE, ssl_verify_peer = FALSE, ssl_verify_hostname = FALSE;
+static gboolean declare_outgoing_queue = FALSE, declare_outgoing_queue_admin = FALSE;
+amqp_boolean_t queue_durable = 0, queue_exclusive = 0, queue_autodelete = 0,
+	queue_durable_admin = 0, queue_exclusive_admin = 0, queue_autodelete_admin = 0;
+static uint16_t heartbeat = 0;
 
 /* Transport implementation */
 int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_path) {
@@ -233,7 +253,6 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 		rmqhost = g_strdup(item->value);
 	else
 		rmqhost = g_strdup("localhost");
-	uint16_t rmqport = AMQP_PROTOCOL_PORT;
 	item = janus_config_get(config, config_general, janus_config_type_item, "port");
 	if(item && item->value && janus_string_to_uint16(item->value, &rmqport) < 0) {
 		JANUS_LOG(LOG_ERR, "Invalid port (%s), falling back to default\n", item->value);
@@ -257,10 +276,6 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 	else
 		password = g_strdup("guest");
 
-	/* SSL config*/
-	gboolean ssl_enabled = FALSE;
-	gboolean ssl_verify_peer = FALSE;
-	gboolean ssl_verify_hostname = FALSE;
 	item = janus_config_get(config, config_general, janus_config_type_item, "ssl_enabled");
 	if(item == NULL) {
 		/* Try legacy property */
@@ -290,6 +305,13 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 			ssl_verify_hostname = TRUE;
 	}
 
+	/* Heartbeat config */
+	item = janus_config_get(config, config_general, janus_config_type_item, "heartbeat");
+	if(item && item->value && janus_string_to_uint16(item->value, &heartbeat) < 0) {
+		JANUS_LOG(LOG_ERR, "Invalid heartbeat timeout (%s), falling back to default (0, disabling heartbeat)\n", item->value);
+		heartbeat = 0;
+	}
+
 	/* Now check if the Janus API must be supported */
 	item = janus_config_get(config, config_general, janus_config_type_item, "enabled");
 	if(item == NULL) {
@@ -338,6 +360,28 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 		}
 		from_janus = g_strdup(item->value);
 
+		/* Set queue options */
+		item = janus_config_get(config, config_general, janus_config_type_item, "queue_durable");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_durable = 1;
+		}
+
+		item = janus_config_get(config, config_general, janus_config_type_item, "queue_exclusive");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_exclusive = 1;
+		}
+
+		item = janus_config_get(config, config_general, janus_config_type_item, "queue_autodelete");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_autodelete = 1;
+		}
+
+		/* By default, declare the outgoing queue */
+		item = janus_config_get(config, config_general, janus_config_type_item, "declare_outgoing_queue");
+		if(!item || !item->value || janus_is_true(item->value)) {
+			declare_outgoing_queue = TRUE;
+		}
+
 		if(janus_exchange == NULL) {
 			JANUS_LOG(LOG_INFO, "RabbitMQ support for Janus API enabled, %s:%d (%s/%s)  exchange_type:%s \n", rmqhost, rmqport, to_janus, from_janus, janus_exchange_type);
 		} else {
@@ -377,6 +421,29 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 		}
 
 		from_janus_admin = g_strdup(item->value);
+
+		/* Set queue options */
+		item = janus_config_get(config, config_admin, janus_config_type_item, "queue_durable_admin");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_durable_admin = 1;
+		}
+
+		item = janus_config_get(config, config_admin, janus_config_type_item, "queue_exclusive_admin");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_exclusive_admin = 1;
+		}
+
+		item = janus_config_get(config, config_admin, janus_config_type_item, "queue_autodelete_admin");
+		if(item && item->value && janus_is_true(item->value)) {
+			queue_autodelete_admin = 1;
+		}
+
+		/* By default, declare the outgoing queue */
+		item = janus_config_get(config, config_admin, janus_config_type_item, "declare_outgoing_queue_admin");
+		if(!item || !item->value || janus_is_true(item->value)) {
+			declare_outgoing_queue_admin = TRUE;
+		}
+
 		JANUS_LOG(LOG_INFO, "RabbitMQ support for Admin API enabled, %s:%d (%s/%s)\n", rmqhost, rmqport, to_janus_admin, from_janus_admin);
 		rmq_admin_api_enabled = TRUE;
 	}
@@ -386,235 +453,13 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 	} else {
 		/* FIXME We currently support a single application, create a new janus_rabbitmq_client instance */
 		rmq_client = g_malloc0(sizeof(janus_rabbitmq_client));
+
 		/* Connect */
-		rmq_client->rmq_conn = amqp_new_connection();
-		amqp_socket_t *socket = NULL;
-		amqp_queue_declare_ok_t *declare = NULL;
-		int status;
-		JANUS_LOG(LOG_VERB, "Creating RabbitMQ socket...\n");
-		if (ssl_enabled) {
-			socket = amqp_ssl_socket_new(rmq_client->rmq_conn);
-			if(socket == NULL) {
-				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error creating socket...\n");
-				goto error;
-			}
-			if(ssl_verify_peer) {
-				amqp_ssl_socket_set_verify_peer(socket, 1);
-			} else {
-				amqp_ssl_socket_set_verify_peer(socket, 0);
-			}
-			if(ssl_verify_hostname) {
-				amqp_ssl_socket_set_verify_hostname(socket, 1);
-			} else {
-				amqp_ssl_socket_set_verify_hostname(socket, 0);
-			}
-			if(ssl_cacert_file) {
-				status = amqp_ssl_socket_set_cacert(socket, ssl_cacert_file);
-				if(status != AMQP_STATUS_OK) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error setting CA certificate... (%s)\n", amqp_error_string2(status));
-					goto error;
-				}
-			}
-			if(ssl_cert_file && ssl_key_file) {
-				status = amqp_ssl_socket_set_key(socket, ssl_cert_file, ssl_key_file);
-				if(status != AMQP_STATUS_OK) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error setting key... (%s)\n", amqp_error_string2(status));
-					goto error;
-				}
-			}
-		} else {
-			socket = amqp_tcp_socket_new(rmq_client->rmq_conn);
-			if(socket == NULL) {
-				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error creating socket...\n");
-				goto error;
-			}
-		}
-		JANUS_LOG(LOG_VERB, "Connecting to RabbitMQ server...\n");
-		status = amqp_socket_open(socket, rmqhost, rmqport);
-		if(status != AMQP_STATUS_OK) {
-			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error opening socket... (%s)\n", amqp_error_string2(status));
-			goto error;
-		}
-		JANUS_LOG(LOG_VERB, "Logging in...\n");
-		amqp_rpc_reply_t result = amqp_login(rmq_client->rmq_conn, vhost, 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, username, password);
-		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error logging in... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-			goto error;
-		}
-		rmq_client->rmq_channel = 1;
-		JANUS_LOG(LOG_VERB, "Opening channel...\n");
-		amqp_channel_open(rmq_client->rmq_conn, rmq_client->rmq_channel);
-		result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error opening channel... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+		int result = janus_rabbitmq_connect();
+		if(result < 0) {
 			goto error;
 		}
-		rmq_client->janus_exchange = amqp_empty_bytes;
-		if(janus_exchange != NULL) {
-			JANUS_LOG(LOG_VERB, "Declaring exchange...\n");
-			rmq_client->janus_exchange = amqp_cstring_bytes(janus_exchange);
-			amqp_exchange_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->janus_exchange, amqp_cstring_bytes(janus_exchange_type), 0, 0, 0, 0, amqp_empty_table);
-			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error diclaring exchange... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-				goto error;
-			}
-		}
-		rmq_client->janus_api_enabled = FALSE;
-		if(rmq_janus_api_enabled) {
-			rmq_client->janus_api_enabled = TRUE;
-
-			/* Set queue options */
-			amqp_boolean_t queue_durable = 0;
-			item = janus_config_get(config, config_general, janus_config_type_item, "queue_durable");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_durable = 1;
-			}
-
-			amqp_boolean_t queue_exclusive = 0;
-			item = janus_config_get(config, config_general, janus_config_type_item, "queue_exclusive");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_exclusive = 1;
-			}
-
-			amqp_boolean_t queue_autodelete = 0;
-			item = janus_config_get(config, config_general, janus_config_type_item, "queue_autodelete");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_autodelete = 1;
-			}
-
-			/* Case when we have a queue_name, and to_janus is the name of the topic to bind on (if exchange_type is topic) */
-			if(queue_name != NULL) {
-				JANUS_LOG(LOG_VERB, "Declaring incoming queue (using queue_name)... (%s)\n", queue_name);
-				declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(queue_name), 0, queue_durable, queue_exclusive, queue_autodelete, amqp_empty_table);
-				rmq_client->to_janus_queue = declare->queue;
-				JANUS_LOG(LOG_VERB, "Incoming queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-
-				if(strcmp(janus_exchange_type, "topic") == 0 || strcmp(janus_exchange_type, "direct") == 0) {
-					JANUS_LOG(LOG_VERB, "Binding queue (%s) to routing key (%s)\n", queue_name, to_janus);
-					amqp_queue_bind(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_queue, rmq_client->janus_exchange, amqp_cstring_bytes(to_janus), amqp_empty_table);
-					result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-					if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-						JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error binding queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-						goto error;
-					}
-				}
-
-			/* Case when to_janus is the name of the queue (and there's no binding) */
-			} else {
-				JANUS_LOG(LOG_VERB, "Declaring incoming queue (using to_janus)... (%s)\n", to_janus);
-				declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(to_janus), 0, queue_durable, queue_exclusive, queue_autodelete, amqp_empty_table);
-				rmq_client->to_janus_queue = declare->queue;
-				JANUS_LOG(LOG_VERB, "Incoming queue declared: (%s)\n", (char *)rmq_client->to_janus_queue.bytes);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-			}
-
-			/* By default, declare the outgoing queue */
-			item = janus_config_get(config, config_general, janus_config_type_item, "declare_outgoing_queue");
-			if(!item || !item->value || janus_is_true(item->value)) {
-				JANUS_LOG(LOG_VERB, "Declaring outgoing queue... (%s)\n", from_janus);
-				amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(from_janus), 0, 0, 0, 0, amqp_empty_table);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-			}
-
-			amqp_basic_consume(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_queue, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
-			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error consuming... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-				goto error;
-			}
-		}
-		rmq_client->admin_api_enabled = FALSE;
-		if(rmq_admin_api_enabled) {
-			rmq_client->admin_api_enabled = TRUE;
 
-			/* Set queue options */
-			amqp_boolean_t queue_durable_admin = 0;
-			item = janus_config_get(config, config_admin, janus_config_type_item, "queue_durable_admin");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_durable_admin = 1;
-			}
-
-			amqp_boolean_t queue_exclusive_admin = 0;
-			item = janus_config_get(config, config_admin, janus_config_type_item, "queue_exclusive_admin");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_exclusive_admin = 1;
-			}
-
-			amqp_boolean_t queue_autodelete_admin = 0;
-			item = janus_config_get(config, config_admin, janus_config_type_item, "queue_autodelete_admin");
-			if(item && item->value && janus_is_true(item->value)) {
-				queue_autodelete_admin = 1;
-			}
-
-			/* Case when we have a queue_name_admin, and to_janus_admin is the name of the routing key to bind on (if exchange_type is topic or direct) */
-			if(queue_name_admin != NULL) {
-				JANUS_LOG(LOG_VERB, "Declaring incoming admin queue (using queue_name_admin)... (%s)\n", queue_name_admin);
-				declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(queue_name_admin), 0, queue_durable_admin, queue_exclusive_admin, queue_autodelete_admin, amqp_empty_table);
-				rmq_client->to_janus_admin_queue = declare->queue;
-				JANUS_LOG(LOG_VERB, "Incoming admin queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-
-				if(strcmp(janus_exchange_type, "topic") == 0 || strcmp(janus_exchange_type, "direct") == 0) {
-					JANUS_LOG(LOG_VERB, "Binding queue (%s) to routing key (%s)\n", queue_name_admin, to_janus_admin);
-					amqp_queue_bind(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, rmq_client->janus_exchange, amqp_cstring_bytes(to_janus_admin), amqp_empty_table);
-					result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-					if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-						JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error binding queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-						goto error;
-					}
-				}
-
-			/* Case when to_janus_admin is the name of the queue (and there's no binding */
-			} else {
-				JANUS_LOG(LOG_VERB, "Declaring incoming admin queue (using to_janus_admin)... (%s)\n", to_janus_admin);
-				rmq_client->to_janus_admin_queue = amqp_cstring_bytes(to_janus_admin);
-				declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, 0, queue_durable_admin, queue_exclusive_admin, queue_autodelete_admin, amqp_empty_table);
-				rmq_client->to_janus_admin_queue = declare->queue;
-				JANUS_LOG(LOG_VERB, "Incoming admin queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-			}
-
-			/* By default, declare the outgoing queue */
-			item = janus_config_get(config, config_admin, janus_config_type_item, "declare_outgoing_queue_admin");
-			if(!item || !item->value || janus_is_true(item->value)) {
-				JANUS_LOG(LOG_VERB, "Declaring outgoing queue... (%s)\n", from_janus_admin);
-				amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(from_janus_admin), 0, 0, 0, 0, amqp_empty_table);
-				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-					goto error;
-				}
-			}
-
-			amqp_basic_consume(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
-			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
-			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
-				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error consuming... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
-				goto error;
-			}
-		}
 		rmq_client->messages = g_async_queue_new();
 		rmq_client->destroy = 0;
 		/* Prepare the transport session (again, just one) */
@@ -643,6 +488,7 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 			janus_config_destroy(config);
 			return -1;
 		}
+
 		janus_mutex_init(&rmq_client->mutex);
 		/* Done */
 		JANUS_LOG(LOG_INFO, "Setup of RabbitMQ integration completed\n");
@@ -684,6 +530,196 @@ int janus_rabbitmq_init(janus_transport_callbacks *callback, const char *config_
 	return -1;
 }
 
+int janus_rabbitmq_connect(void) {
+	rmq_client->connected = 0;
+	/* Connect */
+	rmq_client->rmq_conn = amqp_new_connection();
+	amqp_socket_t *socket = NULL;
+	amqp_queue_declare_ok_t *declare = NULL;
+	int status;
+	JANUS_LOG(LOG_VERB, "Creating RabbitMQ socket...\n");
+	if(ssl_enabled) {
+		socket = amqp_ssl_socket_new(rmq_client->rmq_conn);
+		if(socket == NULL) {
+			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error creating socket...\n");
+			return -1;
+		}
+		amqp_ssl_socket_set_verify_peer(socket, ssl_verify_peer);
+		amqp_ssl_socket_set_verify_hostname(socket, ssl_verify_hostname);
+
+		if(ssl_cacert_file) {
+			status = amqp_ssl_socket_set_cacert(socket, ssl_cacert_file);
+			if(status != AMQP_STATUS_OK) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error setting CA certificate... (%s)\n", amqp_error_string2(status));
+				return -1;
+			}
+		}
+		if(ssl_cert_file && ssl_key_file) {
+			status = amqp_ssl_socket_set_key(socket, ssl_cert_file, ssl_key_file);
+			if(status != AMQP_STATUS_OK) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error setting key... (%s)\n", amqp_error_string2(status));
+				return -1;
+			}
+		}
+	} else {
+		socket = amqp_tcp_socket_new(rmq_client->rmq_conn);
+		if(socket == NULL) {
+			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error creating socket...\n");
+			return -1;
+		}
+	}
+	JANUS_LOG(LOG_VERB, "Connecting to RabbitMQ server...\n");
+	status = amqp_socket_open(socket, rmqhost, rmqport);
+	if(status != AMQP_STATUS_OK) {
+		JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error opening socket... (%s)\n", amqp_error_string2(status));
+		return -1;
+	}
+	JANUS_LOG(LOG_VERB, "Logging in...\n");
+	amqp_rpc_reply_t result = amqp_login(rmq_client->rmq_conn, vhost, 0, 131072, heartbeat, AMQP_SASL_METHOD_PLAIN, username, password);
+	if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+		JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error logging in... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+		return -1;
+	}
+	rmq_client->rmq_channel = 1;
+	JANUS_LOG(LOG_VERB, "Opening channel...\n");
+	amqp_channel_open(rmq_client->rmq_conn, rmq_client->rmq_channel);
+	result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+	if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+		JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error opening channel... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+		return -1;
+	}
+	rmq_client->janus_exchange = amqp_empty_bytes;
+	if(janus_exchange != NULL) {
+		JANUS_LOG(LOG_VERB, "Declaring exchange...\n");
+		rmq_client->janus_exchange = amqp_cstring_bytes(janus_exchange);
+		amqp_exchange_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->janus_exchange, amqp_cstring_bytes(janus_exchange_type), 0, 0, 0, 0, amqp_empty_table);
+		result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring exchange... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+			return -1;
+		}
+	}
+	rmq_client->janus_api_enabled = FALSE;
+	if(rmq_janus_api_enabled) {
+		rmq_client->janus_api_enabled = TRUE;
+
+		/* Case when we have a queue_name, and to_janus is the name of the topic to bind on (if exchange_type is topic) */
+		if(queue_name != NULL) {
+			JANUS_LOG(LOG_VERB, "Declaring incoming queue (using queue_name)... (%s)\n", queue_name);
+			declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(queue_name), 0, queue_durable, queue_exclusive, queue_autodelete, amqp_empty_table);
+			rmq_client->to_janus_queue = declare->queue;
+			JANUS_LOG(LOG_VERB, "Incoming queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+
+			if(strcmp(janus_exchange_type, "topic") == 0 || strcmp(janus_exchange_type, "direct") == 0) {
+				JANUS_LOG(LOG_VERB, "Binding queue (%s) to routing key (%s)\n", queue_name, to_janus);
+				amqp_queue_bind(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_queue, rmq_client->janus_exchange, amqp_cstring_bytes(to_janus), amqp_empty_table);
+				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error binding queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+					return -1;
+				}
+			}
+
+		/* Case when to_janus is the name of the queue (and there's no binding) */
+		} else {
+			JANUS_LOG(LOG_VERB, "Declaring incoming queue (using to_janus)... (%s)\n", to_janus);
+			declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(to_janus), 0, queue_durable, queue_exclusive, queue_autodelete, amqp_empty_table);
+			rmq_client->to_janus_queue = declare->queue;
+			JANUS_LOG(LOG_VERB, "Incoming queue declared: (%s)\n", (char *)rmq_client->to_janus_queue.bytes);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+		}
+
+		if (declare_outgoing_queue) {
+			JANUS_LOG(LOG_VERB, "Declaring outgoing queue... (%s)\n", from_janus);
+			amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(from_janus), 0, 0, 0, 0, amqp_empty_table);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+		}
+
+		amqp_basic_consume(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_queue, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
+		result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error consuming... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+			return -1;
+		}
+	}
+	rmq_client->admin_api_enabled = FALSE;
+	if(rmq_admin_api_enabled) {
+		rmq_client->admin_api_enabled = TRUE;
+
+		/* Case when we have a queue_name_admin, and to_janus_admin is the name of the routing key to bind on (if exchange_type is topic or direct) */
+		if(queue_name_admin != NULL) {
+			JANUS_LOG(LOG_VERB, "Declaring incoming admin queue (using queue_name_admin)... (%s)\n", queue_name_admin);
+			declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(queue_name_admin), 0, queue_durable_admin, queue_exclusive_admin, queue_autodelete_admin, amqp_empty_table);
+			rmq_client->to_janus_admin_queue = declare->queue;
+			JANUS_LOG(LOG_VERB, "Incoming admin queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+
+			if(strcmp(janus_exchange_type, "topic") == 0 || strcmp(janus_exchange_type, "direct") == 0) {
+				JANUS_LOG(LOG_VERB, "Binding queue (%s) to routing key (%s)\n", queue_name_admin, to_janus_admin);
+				amqp_queue_bind(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, rmq_client->janus_exchange, amqp_cstring_bytes(to_janus_admin), amqp_empty_table);
+				result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+				if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+					JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error binding queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+					return -1;
+				}
+			}
+
+		/* Case when to_janus_admin is the name of the queue (and there's no binding */
+		} else {
+			JANUS_LOG(LOG_VERB, "Declaring incoming admin queue (using to_janus_admin)... (%s)\n", to_janus_admin);
+			rmq_client->to_janus_admin_queue = amqp_cstring_bytes(to_janus_admin);
+			declare = amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, 0, queue_durable_admin, queue_exclusive_admin, queue_autodelete_admin, amqp_empty_table);
+			rmq_client->to_janus_admin_queue = declare->queue;
+			JANUS_LOG(LOG_VERB, "Incoming admin queue declared: (%s)\n", (char *) rmq_client->to_janus_queue.bytes);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+		}
+
+		if (declare_outgoing_queue_admin){
+			JANUS_LOG(LOG_VERB, "Declaring outgoing queue... (%s)\n", from_janus_admin);
+			amqp_queue_declare(rmq_client->rmq_conn, rmq_client->rmq_channel, amqp_cstring_bytes(from_janus_admin), 0, 0, 0, 0, amqp_empty_table);
+			result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+			if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+				JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error declaring queue... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+				return -1;
+			}
+		}
+
+		amqp_basic_consume(rmq_client->rmq_conn, rmq_client->rmq_channel, rmq_client->to_janus_admin_queue, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
+		result = amqp_get_rpc_reply(rmq_client->rmq_conn);
+		if(result.reply_type != AMQP_RESPONSE_NORMAL) {
+			JANUS_LOG(LOG_FATAL, "Can't connect to RabbitMQ server: error consuming... %s, %s\n", amqp_error_string2(result.library_error), amqp_method_name(result.reply.id));
+			return -1;
+		}
+	}
+
+	rmq_client->connected = 1;
+
+	JANUS_LOG(LOG_INFO, "RabbitMQ Connected successfully");
+
+	return 0;
+}
+
 void janus_rabbitmq_destroy(void) {
 	if(!g_atomic_int_get(&initialized))
 		return;
@@ -696,9 +732,7 @@ void janus_rabbitmq_destroy(void) {
 			g_thread_join(rmq_client->in_thread);
 		if(rmq_client->out_thread)
 			g_thread_join(rmq_client->out_thread);
-		if(rmq_client->rmq_conn && rmq_client->rmq_channel) {
-			amqp_channel_close(rmq_client->rmq_conn, rmq_client->rmq_channel, AMQP_REPLY_SUCCESS);
-			amqp_connection_close(rmq_client->rmq_conn, AMQP_REPLY_SUCCESS);
+		if(rmq_client->rmq_conn) {
 			amqp_destroy_connection(rmq_client->rmq_conn);
 		}
 	}
@@ -891,6 +925,8 @@ void *janus_rmq_in_thread(void *data) {
 	timeout.tv_sec = 0;
 	timeout.tv_usec = 20000;
 	amqp_frame_t frame;
+	guint rmq_reconnect_backoff = rmq_reconnect_backoff_initial;
+
 	while(!rmq_client->destroy && !g_atomic_int_get(&stopping)) {
 		amqp_maybe_release_buffers(rmq_client->rmq_conn);
 		/* Wait for a frame */
@@ -900,8 +936,31 @@ void *janus_rmq_in_thread(void *data) {
 			if(res == AMQP_STATUS_TIMEOUT || res == AMQP_STATUS_SSL_ERROR)
 				continue;
 			JANUS_LOG(LOG_VERB, "Error on amqp_simple_wait_frame_noblock: %d (%s)\n", res, amqp_error_string2(res));
-			break;
+
+			rmq_client->connected = 0;
+
+			/* Try and reconnect */
+			if(rmq_client->rmq_conn) {
+				amqp_destroy_connection(rmq_client->rmq_conn);
+			}
+
+			if(!g_atomic_int_get(&stopping)) {
+				JANUS_LOG(LOG_VERB, "Trying to reconnect with RabbitMQ Server\n");
+				int result = janus_rabbitmq_connect();
+				if(result < 0) {
+					JANUS_LOG(LOG_WARN, "Failed to reconnect to RabbitMQ Server. Retrying in %fs...\n", (gfloat)rmq_reconnect_backoff/1000000);
+					g_usleep(rmq_reconnect_backoff);
+					rmq_reconnect_backoff *= rmq_reconnect_backoff_multiplier;
+					if(rmq_reconnect_backoff >= rmq_reconnect_backoff_max)
+						rmq_reconnect_backoff = rmq_reconnect_backoff_max;
+				} else {
+					rmq_reconnect_backoff = rmq_reconnect_backoff_initial;
+				}
+
+				continue;
+			}
 		}
+
 		/* We expect method first */
 		JANUS_LOG(LOG_VERB, "Frame type %d, channel %d\n", frame.frame_type, frame.channel);
 		if(frame.frame_type != AMQP_FRAME_METHOD)
@@ -973,7 +1032,20 @@ void *janus_rmq_out_thread(void *data) {
 		return NULL;
 	}
 	JANUS_LOG(LOG_VERB, "Joining RabbitMQ out thread\n");
+	guint rmq_reconnect_backoff = rmq_reconnect_backoff_initial;
 	while(!rmq_client->destroy && !g_atomic_int_get(&stopping)) {
+
+		if(!rmq_client->connected) {
+			g_usleep(rmq_reconnect_backoff);
+			rmq_reconnect_backoff *= rmq_reconnect_backoff_multiplier;
+			if (rmq_reconnect_backoff >= rmq_reconnect_backoff_max)
+				rmq_reconnect_backoff = rmq_reconnect_backoff_max;
+
+			continue;
+		}
+
+		rmq_reconnect_backoff = rmq_reconnect_backoff_initial;
+
 		/* We send messages from here as well, not only notifications */
 		janus_rabbitmq_response *response = g_async_queue_pop(rmq_client->messages);
 		if(response == &exit_message)