comparison src/http/modules/ngx_http_mp4_module.c @ 684:660139fd80ca NGINX_1_3_5

nginx 1.3.5 *) Change: the ngx_http_mp4_module module no longer skips tracks in formats other than H.264 and AAC. *) Bugfix: a segmentation fault might occur in a worker process if the "map" directive was used with variables as values. *) Bugfix: a segmentation fault might occur in a worker process if the "geo" directive was used with the "ranges" parameter but without the "default" parameter; the bug had appeared in 0.8.43. Thanks to Zhen Chen and Weibin Yao. *) Bugfix: in the -p command-line parameter handling. *) Bugfix: in the mail proxy server. *) Bugfix: of minor potential bugs. Thanks to Coverity. *) Bugfix: nginx/Windows could not be built with Visual Studio 2005 Express. Thanks to HAYASHI Kentaro.
author Igor Sysoev <http://sysoev.ru>
date Tue, 21 Aug 2012 00:00:00 +0400
parents 597573166f34
children
comparison
equal deleted inserted replaced
683:28cc2a208803 684:660139fd80ca
1840 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, 1840 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
1841 "stsd entries:%uD, media:%*s", 1841 "stsd entries:%uD, media:%*s",
1842 ngx_mp4_get_32value(stsd_atom->entries), 1842 ngx_mp4_get_32value(stsd_atom->entries),
1843 4, stsd_atom->media_name); 1843 4, stsd_atom->media_name);
1844 1844
1845 /* supported media format: "avc1" (H.264) and "mp4a" (MPEG-4/AAC) */
1846
1847 if (ngx_strncmp(stsd_atom->media_name, "avc1", 4) != 0
1848 && ngx_strncmp(stsd_atom->media_name, "mp4a", 4) != 0)
1849 {
1850 return NGX_DECLINED;
1851 }
1852
1853 trak = ngx_mp4_last_trak(mp4); 1845 trak = ngx_mp4_last_trak(mp4);
1854 1846
1855 atom = &trak->stsd_atom_buf; 1847 atom = &trak->stsd_atom_buf;
1856 atom->temporary = 1; 1848 atom->temporary = 1;
1857 atom->pos = atom_header; 1849 atom->pos = atom_header;