Skip to content

Commit 90bef0c

Browse files
committed
[misc] fix a double free bug and update README files.
1 parent 81ec349 commit 90bef0c

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

README.CN.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626

2727
* [VLC](http://www.videolan.org) (RTMP & HTTP-FLV)/[OBS](https://obsproject.com) (RTMP & HTTP-FLV)/[JW Player](https://www.jwplayer.com) (RTMP)/[flv.js](https://github.com/Bilibili/flv.js) (HTTP-FLV).
2828

29+
## 注意
30+
31+
[flv.js](https://github/com/Bilibili/flv.js)只能运行在支持[Media Source Extensions](https://www.w3.org/TR/media-source)的浏览器上。
32+
2933
# 依赖
3034

3135
* 在类Unix系统上,需要GNU make,用于调用编译器来编译软件。
@@ -162,6 +166,16 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
162166

163167
http://example.com[:port]/dir/streamname.mpd
164168

169+
# 示例图片
170+
171+
## RTMP ([JW Player](https://www.jwplayer.com)) & HTTP-FLV ([VLC](http://www.videolan.org))
172+
173+
![RTMP & HTTP-FLV](samples/jwplayer_vlc.png)
174+
175+
## HTTP-FLV ([flv.js](https://github.com/Bilibili/flv.js))
176+
177+
![HTTP-FLV](samples/flv.js.png)
178+
165179
# nginx-http-flv-module的安装包
166180

167181
详情见[nginx-http-flv-module-packages](https://github.com/winshining/nginx-http-flv-module-packages)

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Media streaming server based on [nginx-rtmp-module](https://github.com/arut/ngin
2626

2727
* [VLC](http://www.videolan.org) (RTMP & HTTP-FLV)/[OBS](https://obsproject.com) (RTMP & HTTP-FLV)/[JW Player](https://www.jwplayer.com) (RTMP)/[flv.js](https://github.com/Bilibili/flv.js) (HTTP-FLV).
2828

29+
## Note
30+
31+
[flv.js](https://github.com/Bilibili/flv.js) can only run with browsers that support [Media Source Extensions](https://www.w3.org/TR/media-source).
32+
2933
# Prerequisites
3034

3135
* GNU make for activating compiler on Unix-like systems to compile software.
@@ -162,6 +166,16 @@ Since some players don't support HTTP chunked transmission, it's better to speci
162166

163167
http://example.com[:port]/dir/streamname.mpd
164168

169+
# Sample Pictures
170+
171+
## RTMP ([JW Player](https://www.jwplayer.com)) & HTTP-FLV ([VLC](http://www.videolan.org))
172+
173+
![RTMP & HTTP-FLV](samples/jwplayer_vlc.png)
174+
175+
## HTTP-FLV ([flv.js](https://github.com/Bilibili/flv.js))
176+
177+
![HTTP-FLV](samples/flv.js.png)
178+
165179
# Packages for nginx-http-flv-module
166180

167181
Please refer to [nginx-http-flv-module-packages](https://github.com/winshining/nginx-http-flv-module-packages).

ngx_rtmp_gop_cache_module.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,6 @@ ngx_rtmp_gop_cache_send(ngx_rtmp_session_t *s)
687687
cs->timestamp += delta;
688688
s->current_time = cs->timestamp;
689689

690-
if (meta) {
691-
handler->free_message_pt(s, meta);
692-
meta = NULL;
693-
}
694-
695690
if (pkt) {
696691
handler->free_message_pt(s, pkt);
697692
pkt = NULL;

samples/flv.js.png

1.28 MB
Loading

samples/jwplayer_vlc.png

1.09 MB
Loading

0 commit comments

Comments
 (0)