Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 37 deletions

diff --git a/src/stream.c b/src/stream.c
index ffb1e82..086369f 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -10,46 +10,11 @@
 #include "core.h"
 
 
-#define MAGIC 0x00814ea5
-#include "magic.h"
-
-
 enum {
 	RTP_RECV_SIZE = 8192,
 };
 
 
-/** Defines a generic media stream */
-struct stream {
-	MAGIC_DECL
-
-	struct le le;            /**< Linked list element                   */
-	struct config_avt cfg;   /**< Stream configuration                  */
-	struct call *call;       /**< Ref. to call object                   */
-	struct sdp_media *sdp;   /**< SDP Media line                        */
-	struct rtp_sock *rtp;    /**< RTP Socket                            */
-	struct rtpkeep *rtpkeep; /**< RTP Keepalive                         */
-	struct rtcp_stats rtcp_stats;/**< RTCP statistics                   */
-	struct jbuf *jbuf;       /**< Jitter Buffer for incoming RTP        */
-	struct mnat_media *mns;  /**< Media NAT traversal state             */
-	const struct menc *menc; /**< Media encryption module               */
-	struct menc_sess *mencs; /**< Media encryption session state        */
-	struct menc_media *mes;  /**< Media Encryption media state          */
-	struct metric metric_tx; /**< Metrics for transmit                  */
-	struct metric metric_rx; /**< Metrics for receiving                 */
-	char *cname;             /**< RTCP Canonical end-point identifier   */
-	uint32_t ssrc_rx;        /**< Incoming syncronizing source          */
-	uint32_t pseq;           /**< Sequence number for incoming RTP      */
-	int pt_enc;              /**< Payload type for encoding             */
-	bool rtcp;               /**< Enable RTCP                           */
-	bool rtcp_mux;           /**< RTP/RTCP multiplex supported by peer  */
-	bool jbuf_started;       /**< True if jitter-buffer was started     */
-	stream_rtp_h *rtph;      /**< Stream RTP handler                    */
-	stream_rtcp_h *rtcph;    /**< Stream RTCP handler                   */
-	void *arg;               /**< Handler argument                      */
-};
-
-
 static inline int lostcalc(struct stream *s, uint16_t seq)
 {
 	const uint16_t delta = seq - s->pseq;
@@ -263,8 +228,6 @@ int stream_alloc(struct stream **sp, const struct config_avt *cfg,
 	if (!s)
 		return ENOMEM;
 
-	MAGIC_INIT(s);
-
 	s->cfg   = *cfg;
 	s->call  = call;
 	s->rtph  = rtph;