Sergio Ammirata
--- a/include/librist/headers.h
+++ b/include/librist/headers.h
 #define RIST_URL_PARAM_STREAM_ID "stream-id"
 #define RIST_URL_PARAM_RTP_TIMESTAMP "rtp-timestamp"
 #define RIST_URL_PARAM_RTP_SEQUENCE "rtp-sequence"
-#define RIST_URL_PARAP_RTP_OUTPUT_PTYPE "rtp-ptype"
+#define RIST_URL_PARAM_RTP_OUTPUT_PTYPE "rtp-ptype"
+#define RIST_URL_PARAM_MUX_MODE "mux-mode"
+#define RIST_URL_PARAM_MUX_FILTER "mux-filter"
--- a/include/librist/headers.h
+++ b/include/librist/headers.h
 #define RIST_ERR_MISSING_CALLBACK_FUNCTION -5
 #define RIST_ERR_NULL_CREDENTIALS -6

+enum rist_mux_mode
+{
+	RIST_MUX_MODE_RAW = 0,
+	RIST_MUX_MODE_AUTO = 1,
+	RIST_MUX_MODE_VIRT_SOURCE_PORT = 2,
+	RIST_MUX_MODE_IPV4 = 3,
+};
+
--- a/src/rist.c
+++ b/src/rist.c
 					  "Dropping oob packet of size %d, max is %d.\n", oob_block->payload_len, RIST_MAX_PACKET_SIZE - 16);
 		return -1;
 	}
-	return rist_oob_enqueue(cctx, oob_block->peer, oob_block->payload, oob_block->payload_len);
+	struct rist_peer *peer = oob_block->peer;
+	if (peer == NULL)
+		peer = cctx->oob_current_peer;