Skip to content

Commit 4eca089

Browse files
committed
Merge branch 'postconf-handler-init'
2 parents 4155794 + 3e25f91 commit 4eca089

File tree

1 file changed

+30
-14
lines changed

1 file changed

+30
-14
lines changed

ngx_rtmp_cmd_module.c

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ static ngx_int_t ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s,
4141
ngx_rtmp_set_buflen_t *v);
4242

4343

44-
ngx_rtmp_connect_pt ngx_rtmp_connect = ngx_rtmp_cmd_connect;
45-
ngx_rtmp_disconnect_pt ngx_rtmp_disconnect = ngx_rtmp_cmd_disconnect;
46-
ngx_rtmp_create_stream_pt ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
47-
ngx_rtmp_close_stream_pt ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
48-
ngx_rtmp_delete_stream_pt ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
49-
ngx_rtmp_publish_pt ngx_rtmp_publish = ngx_rtmp_cmd_publish;
50-
ngx_rtmp_play_pt ngx_rtmp_play = ngx_rtmp_cmd_play;
51-
ngx_rtmp_seek_pt ngx_rtmp_seek = ngx_rtmp_cmd_seek;
52-
ngx_rtmp_pause_pt ngx_rtmp_pause = ngx_rtmp_cmd_pause;
44+
ngx_rtmp_connect_pt ngx_rtmp_connect;
45+
ngx_rtmp_disconnect_pt ngx_rtmp_disconnect;
46+
ngx_rtmp_create_stream_pt ngx_rtmp_create_stream;
47+
ngx_rtmp_close_stream_pt ngx_rtmp_close_stream;
48+
ngx_rtmp_delete_stream_pt ngx_rtmp_delete_stream;
49+
ngx_rtmp_publish_pt ngx_rtmp_publish;
50+
ngx_rtmp_play_pt ngx_rtmp_play;
51+
ngx_rtmp_seek_pt ngx_rtmp_seek;
52+
ngx_rtmp_pause_pt ngx_rtmp_pause;
5353

5454

55-
ngx_rtmp_stream_begin_pt ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
56-
ngx_rtmp_stream_eof_pt ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
57-
ngx_rtmp_stream_dry_pt ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
58-
ngx_rtmp_recorded_pt ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
59-
ngx_rtmp_set_buflen_pt ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
55+
ngx_rtmp_stream_begin_pt ngx_rtmp_stream_begin;
56+
ngx_rtmp_stream_eof_pt ngx_rtmp_stream_eof;
57+
ngx_rtmp_stream_dry_pt ngx_rtmp_stream_dry;
58+
ngx_rtmp_recorded_pt ngx_rtmp_recorded;
59+
ngx_rtmp_set_buflen_pt ngx_rtmp_set_buflen;
6060

6161

6262
static ngx_int_t ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf);
@@ -766,5 +766,21 @@ ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf)
766766
*ch = *bh;
767767
}
768768

769+
ngx_rtmp_connect = ngx_rtmp_cmd_connect;
770+
ngx_rtmp_disconnect = ngx_rtmp_cmd_disconnect;
771+
ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
772+
ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
773+
ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
774+
ngx_rtmp_publish = ngx_rtmp_cmd_publish;
775+
ngx_rtmp_play = ngx_rtmp_cmd_play;
776+
ngx_rtmp_seek = ngx_rtmp_cmd_seek;
777+
ngx_rtmp_pause = ngx_rtmp_cmd_pause;
778+
779+
ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
780+
ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
781+
ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
782+
ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
783+
ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
784+
769785
return NGX_OK;
770786
}

0 commit comments

Comments
 (0)