Mercurial > hg > nginx

comparison src/http/modules/ngx_http_mp4_module.c @ 4820:49d65c9364fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mp4: removed restriction to avc1/mp4a formats (ticket #194).
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 17 Aug 2012 11:02:35 +0000
parents 192f54280a7a
children 37671d0042b7
comparison
equal deleted inserted replaced
4819:49a3fb31a05c 4820:49d65c9364fc
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;