zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-18 17:21:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dash' of https://github.com/ReneVolution/nginx-rtmp-module into dash

Browse source 
Conflicts:
	dash/ngx_rtmp_dash_module.c
This commit is contained in:
René Calles 2013-11-28 15:02:05 +00:00
parent 4b3385562a ed68e4a2eb
commit 46edc6ccfd
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dash/ngx_rtmp_dash_module.c
View file

@ -1192,14 +1192,6 @@ ngx_rtmp_dash_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
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[0] = in->buf->pos[4];