From 60e6179727d7f85b4c1dc7c8a0e45b2bfc217acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20K=C3=B6ritz?= Date: Tue, 3 Sep 2019 16:03:46 +0200 Subject: [PATCH] Fixed RTSP ffmpeg compatibility --- .gitignore | 1 + rtsp/RTSPServer.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a1dd7fd..b376486 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.jpeg actioncam *.prof +.vscode/ \ No newline at end of file diff --git a/rtsp/RTSPServer.go b/rtsp/RTSPServer.go index c596d2a..042be2b 100644 --- a/rtsp/RTSPServer.go +++ b/rtsp/RTSPServer.go @@ -89,7 +89,7 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) { for _, header := range packet[1:] { parts := strings.Split(header, ":") if len(parts) >= 2 { - headers[parts[0]] = strings.Join(parts[1:], ":") + headers[parts[0]] = strings.TrimSpace(strings.Join(parts[1:], ":")) } } @@ -105,7 +105,7 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) { replyCSeq(conn, headers) writeHeader(conn, "Content-Type", "application/sdp") writeHeader(conn, "Content-Length", fmt.Sprintf("%d", len(s.sdp))) - conn.Write([]byte(fmt.Sprintf("\r\n%s\r\n", s.sdp))) + conn.Write([]byte(fmt.Sprintf("\r\n%s", s.sdp))) case "SETUP": transportDescription := strings.Split(headers["Transport"], ";") rtpDescription := transportDescription[len(transportDescription)-1]