mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing building by gcc-4.7.

Browse Source
This commit is contained in:
Igor Sysoev 2011-09-14 15:25:46 +00:00
parent 4a383594fb
commit acdac73688
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/http/modules/ngx_http_mp4_module.c
View File

@ -1702,7 +1702,6 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
{ {
u_char *atom_header, *atom_table; u_char *atom_header, *atom_table;
size_t atom_size; size_t atom_size;
uint32_t entries;
ngx_buf_t *atom; ngx_buf_t *atom;
ngx_mp4_stsd_atom_t *stsd_atom; ngx_mp4_stsd_atom_t *stsd_atom;
ngx_http_mp4_trak_t *trak; ngx_http_mp4_trak_t *trak;
@ -1718,8 +1717,6 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
ngx_mp4_set_32value(stsd_atom->size, atom_size); ngx_mp4_set_32value(stsd_atom->size, atom_size);
ngx_mp4_set_atom_name(stsd_atom, 's', 't', 's', 'd'); ngx_mp4_set_atom_name(stsd_atom, 's', 't', 's', 'd');
entries = ngx_mp4_get_32value(stsd_atom->entries);
if ((uint64_t) (sizeof(ngx_mp4_stsd_atom_t) - sizeof(ngx_mp4_atom_header_t)) if ((uint64_t) (sizeof(ngx_mp4_stsd_atom_t) - sizeof(ngx_mp4_atom_header_t))
> atom_data_size) { > atom_data_size) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,