Skip to content

Commit

Permalink
[misc] fix a double free bug and update README files.
Browse files Browse the repository at this point in the history
  • Loading branch information
winshining committed Aug 23, 2018
1 parent 81ec349 commit 90bef0c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
14 changes: 14 additions & 0 deletions README.CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@

* [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).

## 注意

[flv.js](https://github/com/Bilibili/flv.js)只能运行在支持[Media Source Extensions](https://www.w3.org/TR/media-source)的浏览器上。

# 依赖

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

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

# 示例图片

## RTMP ([JW Player](https://www.jwplayer.com)) & HTTP-FLV ([VLC](http://www.videolan.org))

![RTMP & HTTP-FLV](samples/jwplayer_vlc.png)

## HTTP-FLV ([flv.js](https://github.com/Bilibili/flv.js))

![HTTP-FLV](samples/flv.js.png)

# nginx-http-flv-module的安装包

详情见[nginx-http-flv-module-packages](https://github.com/winshining/nginx-http-flv-module-packages)
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ Media streaming server based on [nginx-rtmp-module](https://github.com/arut/ngin

* [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).

## Note

[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).

# Prerequisites

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

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

# Sample Pictures

## RTMP ([JW Player](https://www.jwplayer.com)) & HTTP-FLV ([VLC](http://www.videolan.org))

![RTMP & HTTP-FLV](samples/jwplayer_vlc.png)

## HTTP-FLV ([flv.js](https://github.com/Bilibili/flv.js))

![HTTP-FLV](samples/flv.js.png)

# Packages for nginx-http-flv-module

Please refer to [nginx-http-flv-module-packages](https://github.com/winshining/nginx-http-flv-module-packages).
Expand Down
5 changes: 0 additions & 5 deletions ngx_rtmp_gop_cache_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -687,11 +687,6 @@ ngx_rtmp_gop_cache_send(ngx_rtmp_session_t *s)
cs->timestamp += delta;
s->current_time = cs->timestamp;

if (meta) {
handler->free_message_pt(s, meta);
meta = NULL;
}

if (pkt) {
handler->free_message_pt(s, pkt);
pkt = NULL;
Expand Down
Binary file added samples/flv.js.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added samples/jwplayer_vlc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 90bef0c

Please sign in to comment.