mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-06-26 15:28:58 +02:00
Merge branch 'dash' of https://github.com/ReneVolution/nginx-rtmp-module into dash
Conflicts: dash/ngx_rtmp_dash_module.c
This commit is contained in:
commit
46edc6ccfd
|
@ -1192,14 +1192,6 @@ ngx_rtmp_dash_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
||||||
return NGX_OK;
|
return NGX_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
p = (u_char *) &delay;
|
|
||||||
|
|
||||||
p[0] = in->buf->pos[4];
|
|
||||||
p[1] = in->buf->pos[3];
|
|
||||||
p[2] = in->buf->pos[2];
|
|
||||||
p[3] = 0;
|
|
||||||
|
|
||||||
|
|
||||||
p = (u_char *) &delay;
|
p = (u_char *) &delay;
|
||||||
|
|
||||||
p[0] = in->buf->pos[4];
|
p[0] = in->buf->pos[4];
|
||||||
|
|
Loading…
Reference in a new issue