Sergey
bcbef42a7c
Merge pull request #26 from sergey-dryabzhinsky/add-publisher-redirect-support
...
Add publisher redirect support, partially
2015-08-06 10:03:37 +03:00
Sergey
b3f0fb0460
Merge pull request #25 from mainyaa/fix-datetime-system
...
Fix hls_datetime system bug
2015-08-06 09:55:52 +03:00
mainyaa
5ed7825c0c
Fix datetime system bug
2015-08-06 15:44:32 +09:00
Sergey Dryabzhinsky
bb67548636
Update:
...
- fix config option parse
- append redirect support in on_connect handler
- add support of rtmpdump handlers for RTMP commands
- try to catch with FMLE
2015-08-01 19:30:01 +03:00
Sergey Dryabzhinsky
3497601b6b
Upsate:
...
- fix memory allocation for URL string
- fix code pass in AMF
2015-08-01 04:50:38 +03:00
Trurl McByte
38f98aa81c
recrete fix on last build
2015-07-21 12:10:40 +03:00
Sergey Dryabzhinsky
139c8c2773
Try to fix AMF packet creation
2015-07-19 22:42:07 +03:00
Sergey Dryabzhinsky
8409e4c499
Fix signed-unsigned warnings
2015-07-12 20:01:53 +03:00
Sergey Dryabzhinsky
cb439496eb
Add forgotten config flag
2015-07-07 16:35:21 +03:00
Sergey Dryabzhinsky
ec3684f9f9
Description not needed here
2015-07-07 16:15:53 +03:00
Sergey Dryabzhinsky
0327cbf651
New function for notify:
...
- add 302 redirect via onStatus of NetConnection
- new option for notify - notify_send_redirect = 0/1
2015-07-07 16:04:31 +03:00
Sergey Dryabzhinsky
ae7974bc2d
Little version up
2015-07-05 08:35:04 +03:00
Sergey
f455876a9c
Merge pull request #24 from sergey-dryabzhinsky/show-recording-status
...
Show recording status
2015-07-05 08:34:36 +03:00
Sergey Dryabzhinsky
4e17054a6d
Fix missing var, check if record have opened file
2015-07-05 08:12:33 +03:00
Sergey Dryabzhinsky
dec648681d
Add recording status to stat page
...
Update rtmp status page with streams and clients recording status
2015-07-05 07:52:41 +03:00
Sergey Dryabzhinsky
46c0fe6d5a
Merge branch 'master' of https://github.com/sergey-dryabzhinsky/nginx-rtmp-module
2015-07-05 04:19:24 +03:00
Sergey Dryabzhinsky
3207278846
Little version up
2015-07-05 04:19:06 +03:00
Sergey
2a68430ae2
Merge pull request #23 from sergey-dryabzhinsky/add-app-name-no-notify-params
...
Add application name into params for all notify
2015-07-05 04:18:38 +03:00
Sergey Dryabzhinsky
70d056bf92
Add application name into params for all notify
...
- append application name into all notify events data
2015-07-05 04:16:18 +03:00
Sergey Dryabzhinsky
658f26fc2c
Merge branch 'master' of https://github.com/sergey-dryabzhinsky/nginx-rtmp-module
2015-07-05 03:54:47 +03:00
Sergey Dryabzhinsky
4da120a125
Little version up
2015-07-05 03:47:42 +03:00
Sergey Dryabzhinsky
fb80463ba9
Little version up
2015-07-05 03:43:42 +03:00
Sergey
21683a4408
Merge pull request #22 from sergey-dryabzhinsky/fix-record-interval-for-all-modes
...
Fix record interal
2015-07-05 03:43:17 +03:00
Sergey Dryabzhinsky
25146e40f9
Fix record interal
...
- it should work if set. No matter record mode is.
2015-07-05 03:41:06 +03:00
Sergey Dryabzhinsky
e9f58daf81
Little version bump
2015-07-05 02:00:43 +03:00
Sergey Dryabzhinsky
3170037e74
Fix getting client connection port
2015-07-05 02:00:14 +03:00
Sergey Dryabzhinsky
dc0b3df1b7
Little version up
2015-07-04 23:07:01 +03:00
Sergey
52b09f5300
Merge pull request #21 from sergey-dryabzhinsky/fix-port-stat-view
...
Use client connection socket port for info
2015-07-04 23:05:57 +03:00
Sergey Dryabzhinsky
ac4197b871
Use client connection socket port for info
2015-07-04 23:04:18 +03:00
Sergey Dryabzhinsky
b49c7fb6ea
Fix version number
2015-07-04 09:04:14 +03:00
Sergey
5d4dfaee43
Merge pull request #20 from dailymotion/DEVSYS-261
...
App name was not copied when creating relay
2015-07-03 02:49:38 +03:00
Sergey
1e5b135b2b
Merge pull request #15 from itpp16/patch-2
...
Update ngx_rtmp_handler.c
2015-07-03 02:45:50 +03:00
Sergey
889e6afccb
Merge pull request #19 from sergey-dryabzhinsky/fmle-onfi-command
...
Add onFi data command for live stream.
2015-07-03 02:15:55 +03:00
Sergey Dryabzhinsky
99cf8a1a10
Add onFi data command for live stream. It is sended by FMLE with timestamps.
2015-07-03 02:15:04 +03:00
Sergey
1055727de8
Merge pull request #18 from dailymotion/DEVSYS-260
...
Display socket port number for each rtmp connection
2015-07-03 02:06:21 +03:00
Sergey
de8faa55a7
Merge pull request #17 from Eugaulerss/patch-1
...
Update ngx_rtmp_handler.c
2015-07-03 02:05:13 +03:00
Sergey
c9e70d5994
Merge pull request #16 from itpp16/patch-4
...
Update ngx_rtmp_play_module.c
2015-07-03 02:04:36 +03:00
Sergey
593368e9e6
Merge pull request #14 from LanetNetwork/master
...
Added Directive "record_interval_size"
2015-07-03 02:02:42 +03:00
Sergey
a05b3babfe
Merge pull request #13 from hannseman/master
...
Remove unneeded space in EXT-X-PLAYLIST-TYPE tag
2015-07-03 02:00:08 +03:00
Sergey
961fde23f7
Merge pull request #12 from sqbing/patch-1
...
Update ngx_rtmp_codec_module.c
2015-07-03 01:55:52 +03:00
Sergey
75fe5406b4
Merge pull request #11 from Florob/ipv6-worker
...
Fix access to config field of ngx_rtmp_in{,6}_addr_t. Closes #290
2015-07-03 01:51:39 +03:00
Sergey
1616a378ef
Merge pull request #10 from cine-io/data-channel-live-record
...
Data channel live record
2015-07-03 01:49:46 +03:00
Sergey
4c1b69b5bb
Merge pull request #9 from cine-io/relay-push-set-data-frame
...
Relay push set data frame
2015-07-03 01:48:30 +03:00
Sergey Dryabzhinsky
038c3bbc67
Merge branch 'cine-io-dont-overwrite-with-invalid-metadata'
2015-07-03 01:36:40 +03:00
Sergey Dryabzhinsky
0d77210815
Merge branch 'dont-overwrite-with-invalid-metadata' of https://github.com/cine-io/nginx-rtmp-module into cine-io-dont-overwrite-with-invalid-metadata
2015-07-03 01:35:53 +03:00
Sergey
c4ee944870
Merge pull request #7 from steelywing/master
...
fix 'volatile' qualifiers error
2015-07-03 01:25:24 +03:00
Sergey
69d79ccda6
Merge pull request #6 from odiszapc/master
...
Add in/out traffice per client
2015-07-03 01:24:04 +03:00
Sergey
859540db60
Merge pull request #5 from berg/parse-scaling-list
...
Parse scaling list from SPS
2015-07-03 01:22:50 +03:00
Sergey
087e5358e2
Merge pull request #4 from berg/dash-frame-rate
...
Don't truncate framerate for MPEG-DASH
2015-07-03 01:21:26 +03:00
Sergey
d797d269a4
Merge pull request #3 from petergeneric/master
...
Allow the filename on disk to use no suffix
2015-07-03 01:19:57 +03:00