ac13bbf1af
merged master into sync
...
o sync
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2012-09-29 00:07:46 +04:00
17886deadd
updated README
2012-09-25 09:05:06 +04:00
6485716fb4
fixed push & pull in auto-push mode
2012-09-22 16:42:43 +04:00
cdb084e375
fixed on_record_done; fixed notification inheritance; fixed logging
2012-09-22 14:46:03 +04:00
9aff59fc43
fixed recording audio splitted into fragments
2012-09-22 13:35:03 +04:00
76211a4bd2
moved some logging from debug to info
2012-09-17 11:46:16 +04:00
129a161fb8
Merge branch 'master' of github.com:arut/nginx-rtmp-module
2012-09-14 16:51:17 +04:00
abc2704db1
added merging up activity flag i nnotifiers
2012-09-13 21:47:57 +04:00
11cc6e6019
implemented sub-applications; recorders are now merged as sub-applications
2012-09-13 21:47:22 +04:00
d8fbe51e3f
changed malloc to nginx alloc
2012-09-13 16:19:16 +04:00
8494e179d1
fixed evaluation variable at the end of string
2012-09-13 15:20:14 +04:00
e1650d8629
added all required arguments to old-style & new-style exec
2012-09-12 19:38:41 +04:00
3f08385144
added common evaluation code
2012-09-12 14:58:31 +04:00
9a31ca9237
added on_record_done & exec_record_done for recorder{} blocks; added new-style args to exec_* notifiers
2012-09-12 14:57:24 +04:00
a4d55c0ff5
fixed compilation
2012-09-12 11:13:49 +04:00
6b0dddbcc0
changed execv to execvp to enable file search
2012-09-10 13:47:29 +04:00
ed5f06db8a
Merge branch 'enotify'
2012-09-10 13:42:52 +04:00
ff247dafff
Merge branch 'multi-record'
2012-09-10 13:38:15 +04:00
52c2ef3f91
added publish/play/done execs
2012-09-09 12:07:27 +04:00
067c73710d
moved notify module to the end of config & added auto_push checks to notifier
2012-09-06 17:46:08 +04:00
2ae585d99b
fixed crash in callback creator
2012-09-06 17:17:34 +04:00
f221540a78
implemented on_publish_done, on_play_done; fixed repeated on_done
2012-09-06 16:10:21 +04:00
004accda9a
implemented manual record open/close by index
2012-09-05 20:20:45 +04:00
6951ef8d18
fixed on_record_done for multiple recorders
2012-09-05 17:07:33 +04:00
3a403f8563
added recorder{} block
2012-09-05 16:49:39 +04:00
b4e7e68ce8
added manual recording flag
2012-09-05 14:33:21 +04:00
02b9e2d4f7
implemented multiple recorder support
2012-09-04 20:36:25 +04:00
81171a8582
added multi-record api
2012-09-04 17:47:32 +04:00
8c5b864339
added global record on/off feature
2012-09-03 19:54:05 +04:00
4a775d6f0b
added auto_push module to build
2012-09-02 17:25:20 +04:00
96526896aa
live stream synchronization
2012-08-30 18:40:12 +04:00
94fdac52a7
Merge branch 'shared_record'
2012-08-30 18:20:35 +04:00
5d7a5ea535
moved app, ctx & module to record header
2012-08-30 18:20:13 +04:00
6b5f76654c
updated README
2012-08-30 17:57:00 +04:00
3c2e29f215
fixed compilation
2012-08-30 17:48:33 +04:00
acf6ea076c
merged from master
2012-08-30 17:39:31 +04:00
1d4f5023f3
added pid to stat
2012-08-30 16:42:21 +04:00
9aa411409d
fixed on_done argument length; thanks to Paul Howes (phowes).
2012-08-30 15:49:07 +04:00
764a3583b2
fixed mp4 sync problem because of different rtmp/mp4 time scales
2012-08-29 13:54:38 +04:00
1dbd9b228d
fixed mp4 seeking
2012-08-29 11:12:32 +04:00
562a6aad7e
fixed non-standard (48kHz) audio streaming
2012-08-29 09:58:56 +04:00
3492892450
fixed bad-looking unix socket client name
2012-08-27 21:07:38 +04:00
8293c425a5
updated README
2012-08-27 19:12:34 +04:00
58491f8fed
fixed compilation
2012-08-27 19:02:45 +04:00
224b6d942a
implemented common base for video-on-demand: added flv & mp4 modules as sub-modules of play module
2012-08-27 18:58:28 +04:00
24539ca116
improved vod scheduling: added dry buffer event
2012-08-26 16:13:23 +04:00
7f447bbe95
implemented MPEG ES descriptor parser; AAC is now fully supported
2012-08-25 16:53:57 +04:00
a92d23d530
added AMF shortcuts & project-wide stream numbers; updated mp4 streamer
2012-08-24 20:46:40 +04:00
f22e72ab21
fixed cursor initialization
2012-08-24 16:08:03 +04:00
db0f765528
added metadata
2012-08-24 13:57:13 +04:00
