Skip to content

Commit c0ad999

Browse files
committed
Merge branch 'exec-static'
2 parents 027c65c + 8c39b37 commit c0ad999

File tree

5 files changed

+324
-118
lines changed

5 files changed

+324
-118
lines changed

ngx_rtmp.c

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
3232
ngx_uint_t ngx_rtmp_max_module;
3333

3434

35+
ngx_thread_volatile ngx_event_t *ngx_rtmp_init_process_events;
36+
37+
3538
static ngx_command_t ngx_rtmp_commands[] = {
3639

3740
{ ngx_string("rtmp"),

ngx_rtmp.h

+3
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,9 @@ ngx_rtmp_is_codec_header(ngx_chain_t *in)
570570
}
571571

572572

573+
extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_process_events;
574+
575+
573576
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_out;
574577
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in;
575578

0 commit comments

Comments
 (0)