fixe merge

src/config.c

@@ -77,6 +77,8 @@ static struct config core_config = {
 		"", "",
 		640, 480,
 		1000000,
+		0,
+		0,
 		30,
 		true,
 		VID_FMT_YUV420P,

src/core.h

@@ -527,6 +527,7 @@ void rtprecv_set_socket(struct rtp_receiver *rx, struct rtp_sock *rtp);
 void rtprecv_set_ssrc(struct rtp_receiver *rx, uint32_t ssrc);
 uint64_t rtprecv_ts_last(struct rtp_receiver *rx);
 void rtprecv_set_ts_last(struct rtp_receiver *rx, uint64_t ts_last);
+void rtprecv_set_estab(struct rtp_receiver *rx, bool estab);
 void rtprecv_flush(struct rtp_receiver *rx);
 void rtprecv_enable(struct rtp_receiver *rx, bool enable);
 int  rtprecv_get_ssrc(struct rtp_receiver *rx, uint32_t *ssrc);

src/rtprecv.c

@@ -578,6 +578,16 @@ void rtprecv_set_ts_last(struct rtp_receiver *rx, uint64_t ts_last)
 	mtx_unlock(rx->mtx);
 }
 
+void rtprecv_set_estab(struct rtp_receiver *rx, bool estab)
+{
+	if (!rx)
+		return;
+
+	mtx_lock(rx->mtx);
+	rx->rtp_estab = estab;
+	mtx_unlock(rx->mtx);
+}
+
 
 void rtprecv_flush(struct rtp_receiver *rx)
 {

src/stream.c

@@ -285,6 +285,9 @@ static void stream_close(struct stream *strm, int err)
 	stream_enable(strm, false);
 	strm->errorh = NULL;
 
+	rtprecv_set_estab(strm->rx, false);
+	rtprecv_flush(strm->rx);
+
 	strm->rx = mem_deref(strm->rx);
 	if (errorh)
 		errorh(strm, err, strm->sess_arg);