Anonymous
a01cc448ee
Fix multiple fallthrough warnings
2017-12-02 19:33:11 +00:00
Sergey Dryabzhinsky
a898a09d87
Merge pull request #247 from heftig/master
...
Minor fixes
2017-05-23 13:40:46 +04:00
Jan Alexander Steffens (heftig)
916f3f8374
Simplify freeing the data chain
2017-05-23 10:11:27 +02:00
Jan Alexander Steffens (heftig)
1c3dc989ef
Work around deletion of still-needed init segments
...
I assume they get accidentally deleted right after they're
written, before the playlist is first created.
Leave them around for another cleanup cycle rather than
risk deleting them while still needed.
2017-05-23 10:11:27 +02:00
Sergey Dryabzhinsky
d25c56fa69
Merge pull request #245 from sergey-dryabzhinsky/revert-199-drop-all-connections-on-reload
...
Revert "Add event-based handle of reload/exit signal"
2017-05-19 02:00:27 +04:00
Sergey Dryabzhinsky
e65f2d099b
Revert "Add event-based handle of reload/exit signal"
2017-05-19 00:59:11 +03:00
Sergey Dryabzhinsky
f31e27fbaf
Merge pull request #236 from Gamec/patch-1
...
EXT-X-ALLOW-CACHE using YES|NO instead of 1|0
2017-04-18 15:27:20 +03:00
Paweł Burda
bb4190e248
EXT-X-ALLOW-CACHE using YES|NO instead of 1|0
...
https://tools.ietf.org/html/draft-pantos-http-live-streaming-07#section-3.3.6
2017-04-18 14:01:35 +02:00
Sergey
542106e4de
Merge pull request #199 from sergey-dryabzhinsky/drop-all-connections-on-reload
...
Add event-based handle of reload/exit signal
2017-04-15 21:08:29 +03:00
Sergey
9121b34bdc
Merge pull request #233 from mbeacom/openssl11
...
OpenSSL-1.1 support cherrypick
2017-04-14 20:04:06 +03:00
Sergey
ff86f5c3fd
Merge pull request #228 from securogroup/auto-crc-mpegts
...
Automatically generate CRC for MPEG-TS packets.
2017-04-13 23:11:58 +03:00
Roman Arutyunyan
f23323a51a
OpenSSL-1.1 support
2017-04-13 15:12:47 -04:00
Chris Wiggins
f8992e572f
Automatically generate CRC for MPEG-TS packets.
...
Includes descriptions from @premultiply from pull sergey-dryabzhinsky/nginx-rtmp-module#123
2017-03-27 12:06:18 +13:00
Sergey
4975784d46
Merge pull request #217 from diegostamigni/record_started
...
`exec_record_started' call moved
2017-02-11 01:03:26 +03:00
Diego Stamigni
07912c5cd1
exec_record_started is now called when the first frame is written in file
2017-02-10 17:31:22 +00:00
Sergey
95d81573c9
Merge pull request #216 from diegostamigni/record_started
...
"exec_record_started" and "on_record_started" events added
2017-02-09 20:46:14 +03:00
Diego Stamigni
bc81475b6b
fixes for typo
2017-02-09 17:02:08 +00:00
Diego Stamigni
6b8155cf3b
"exec_record_started" event and "on_record_started" notification added fired when the system starts the recording process
2017-02-09 13:47:29 +00:00
Sergey
9c71ce6761
Merge pull request #202 from fserreau/dev
...
Fixed record from infinite loop
2016-11-30 03:23:10 +03:00
Francois Serreau
d86287fe3c
Fixed record from infinite loop
2016-11-29 13:55:56 +01:00
Sergey Dryabzhinsky
ebe697b601
Add event-based handle of reload/exit signal
...
- more useable types for session structure fields
- add event and timers to catch nginx exiting status
and close all session / connections
or main event loop will wait forever
2016-11-26 09:17:36 +03:00
Sergey Dryabzhinsky
dc76eb2641
Merge fixes for nginx 1.11.5-style cache-manager by @arut
...
- merge some code from 5150993acc
2016-11-26 00:48:24 +03:00
Sergey Dryabzhinsky
18b228a01d
Merge branch 'arut-1.1.9-fix-dynamic-module' into dev
2016-11-26 00:44:35 +03:00
Sergey Dryabzhinsky
4bf6852a28
Get changes from @arut c0bf381d10
2016-11-26 00:43:32 +03:00
Sergey
4809496d78
Merge pull request #198 from sergey-dryabzhinsky/akotulu-master
...
Merge fixes from @akotulu for #197
2016-11-26 00:29:09 +03:00
Sergey Dryabzhinsky
315e8aa497
Merge fixes from @akotulu for #197
2016-11-26 00:25:17 +03:00
Sergey
dbcb7aa966
Merge pull request #184 from Stvad/dev
...
Infinite loop fix #145
2016-11-25 23:50:01 +03:00
Vladyslav Sitalo
2fd45d4114
metadata. infinite loop. #145
2016-09-12 16:27:32 +02:00
Sergey
c47cb2370f
Merge pull request #178 from sergey-dryabzhinsky/add-par-to-sar
...
Fix DASH playlist generation - validation check pass
2016-08-15 13:48:06 +03:00
Sergey Dryabzhinsky
a037181c59
Fix DASH playlist generation - validation check pass
...
- add PAR value to AdaptationSet
- move UTCTiming tag to end of playlist
2016-08-07 09:43:34 +03:00
Sergey Dryabzhinsky
7381b66e13
typo
2016-08-06 07:43:20 +03:00
Sergey Dryabzhinsky
a88bc39141
Fixes:
...
- fix first fragment search
- fix log output for discontinuety flag
2016-08-06 07:39:17 +03:00
Sergey Dryabzhinsky
998de2937a
Try to coop with playlist length and fragments duration
2016-08-06 05:23:18 +03:00
Sergey
a2d65b4251
Merge pull request #173 from heftig/master
...
Allow more than one option to 'listen'
2016-07-27 11:43:26 +04:00
Jan Alexander Steffens (heftig)
26d6107307
Allow more than one option to 'listen'
...
Without this patch, you wouldn't be able to specify e.g.
both so_keepalive and ipv6only, in conflict with the docs.
2016-07-27 09:20:21 +02:00
Sergey
e38fcac9c9
Merge pull request #172 from sergey-dryabzhinsky/issue-145-infinite-loop
...
Hack for circular chain by @heftig
2016-07-27 00:27:19 +04:00
Sergey Dryabzhinsky
e4799c633a
Hack for circular chain by @heftig
...
- fix infinite loop on session close
2016-07-26 23:24:32 +03:00
Sergey
7db5ef0ea5
Merge pull request #138 from sergey-dryabzhinsky/fix-121-dash-availabilityEndTime
...
Rewrite availabilityStart and publish time generation to DASH manifest
2016-07-06 18:02:14 +03:00
Sergey
a9e0056d5b
Merge pull request #139 from sergey-dryabzhinsky/add-player-redirect-support
...
Add redirect support for playback notify
2016-06-26 20:19:24 +03:00
Sergey
1d5a20ea2b
Merge pull request #160 from sergey-dryabzhinsky/issue-158-fix-windows-build-with-1.11-nginx
...
Type conversions for MSVS
2016-06-25 17:15:06 +03:00
Sergey Dryabzhinsky
eca3fa3b04
Fix unused var warning for nginx < 1.11
2016-06-25 17:13:46 +03:00
Sergey Dryabzhinsky
2b0596051e
Another type conversion fix for MSVS
2016-06-25 16:00:57 +03:00
Sergey Dryabzhinsky
77ba897d2f
Another compiler warning fix
2016-06-25 13:55:08 +03:00
Sergey Dryabzhinsky
6d9a85e061
Type conversion
...
- remove double var definition
- add conversion to u_char for socketaddr
2016-06-24 00:00:14 +03:00
Sergey Dryabzhinsky
b4ecd58544
Adjusted time roundup, time string formating
2016-06-20 14:53:09 +03:00
Sergey
aee81e3c8f
Merge pull request #150 from karlisk/dev
...
Updated README.md
2016-06-13 12:53:55 +03:00
Kārlis K
45a02da89e
Updated README.md
...
Updated info about Multi-worker support, may require better detailed
explanation than provided.
2016-06-12 19:00:04 +03:00
Sergey
51396cdebb
Merge pull request #148 from RocFang/dev
...
typo fix.
2016-06-10 16:25:40 +03:00
RocFang
358806e915
typo fix
2016-06-10 20:07:00 +08:00
RocFang
14b56c4a5b
type error fix: accroding to the code details, ngx_rtmp_live_app_conf_t->buflen should be ngx_rtmp_live_app_conf_t->buffer. It's a flag rather than a msec config
2016-06-10 18:39:48 +08:00