Merge 2.0release #1551

ossrs · Jan 5, 2020 · 6d0ac35 · 6d0ac35
2 parents 79314f7 + b5f4b96
commit 6d0ac35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -268,6 +268,7 @@ For previous versions, please read:
 
 ## V2 changes
 
+* v2.0, 2020-01-05, Merge [#1551][bug #1551], fix memory leak in RTSP stack. 2.0.270
 * v2.0, 2019-12-26, For [#1488][bug #1488], pass client ip to http callback. 2.0.269
 * v2.0, 2019-12-23, Fix [srs-librtmp #22](https://github.com/ossrs/srs-librtmp/issues/22), parse vhost splited by single seperator. 2.0.268
 * v2.0, 2019-12-23, Fix [srs-librtmp #25](https://github.com/ossrs/srs-librtmp/issues/25), build srs-librtmp on windows. 2.0.267
@@ -1545,6 +1546,7 @@ Winlin
 [bug #1304]: https://github.com/ossrs/srs/pull/1304
 [bug #1524]: https://github.com/ossrs/srs/issues/1524
 [bug #1488]: https://github.com/ossrs/srs/issues/1488
+[bug #1551]: https://github.com/ossrs/srs/pull/1551
 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
 
 [bug #735]: https://github.com/ossrs/srs/issues/735

diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp
@@ -159,7 +159,7 @@ void SrsRtpPacket::copy(SrsRtpPacket* src)
 
     chunked = src->chunked;
     completed = src->completed;
-    
+
     srs_freep(audio);
     audio = new SrsAudioFrame();
 }