mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-06-18 04:15:07 +02:00
Missing fixes from upstreams
This commit is contained in:
parent
9faaa99829
commit
f1cde7d4a4
|
@ -358,7 +358,8 @@ static void
|
|||
ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
|
||||
{
|
||||
ngx_uint_t profile_idc, width, height, crop_left, crop_right,
|
||||
crop_top, crop_bottom, frame_mbs_only, n, cf_idc,
|
||||
crop_top, crop_bottom, frame_mbs_only, n, cf_n, cf_idc,
|
||||
// num_ref_frames;
|
||||
num_ref_frames, sl_size, sl_index, sl_udelta;
|
||||
ngx_int_t sl_last, sl_next, sl_delta;
|
||||
ngx_rtmp_codec_ctx_t *ctx;
|
||||
|
@ -433,7 +434,7 @@ ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
|
|||
/* seq scaling matrix present */
|
||||
if (ngx_rtmp_bit_read(&br, 1)) {
|
||||
|
||||
for (n = 0; n < (cf_idc != 3 ? 8u : 12u); n++) {
|
||||
for (n = 0, cf_n = (cf_idc != 3 ? 8u : 12u); n < cf_n; n++) {
|
||||
|
||||
/* seq scaling list present */
|
||||
if (ngx_rtmp_bit_read(&br, 1)) {
|
||||
|
|
|
@ -178,7 +178,7 @@ ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
ngx_conf_merge_msec_value(conf->sync, prev->sync, 300);
|
||||
ngx_conf_merge_msec_value(conf->idle_timeout, prev->idle_timeout, 0);
|
||||
ngx_conf_merge_value(conf->interleave, prev->interleave, 0);
|
||||
ngx_conf_merge_value(conf->wait_key, prev->wait_key, 1);
|
||||
ngx_conf_merge_value(conf->wait_key, prev->wait_key, 0);
|
||||
ngx_conf_merge_value(conf->wait_video, prev->wait_video, 0);
|
||||
ngx_conf_merge_value(conf->publish_notify, prev->publish_notify, 0);
|
||||
ngx_conf_merge_value(conf->play_restart, prev->play_restart, 0);
|
||||
|
|
|
@ -101,7 +101,7 @@ ngx_rtmp_create_abort(ngx_rtmp_session_t *s, uint32_t csid)
|
|||
"create: abort csid=%uD", csid);
|
||||
|
||||
{
|
||||
NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE);
|
||||
NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ABORT);
|
||||
|
||||
NGX_RTMP_USER_OUT4(csid);
|
||||
|
||||
|
|
Loading…
Reference in a new issue