summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-10-01 05:37:30 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-10-01 05:37:30 +0000
commit8c8e599c6e59391de1217e5e547aeba5fd198e99 (patch)
tree0b3dd85dcb37885734629088aab6db5222f873de
parent023e0da8dc6b01d6c7a226963edec97d08ca91ad (diff)
downloadnginx-8c8e599c6e59391de1217e5e547aeba5fd198e99.tar.gz
nginx-8c8e599c6e59391de1217e5e547aeba5fd198e99.tar.bz2
Merging r4089 missed in r4170 merge.
-rw-r--r--src/http/modules/ngx_http_mp4_module.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index acbb94866..1140d9174 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -742,7 +742,7 @@ ngx_http_mp4_process(ngx_http_mp4_file_t *mp4)
+ ngx_http_mp4_update_mdat_atom(mp4, start_offset)
- start_offset;
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"mp4 adjustment:%D", adjustment);
for (i = 0; i < mp4->trak.nelts; i++) {
@@ -836,7 +836,7 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
atom_name = atom_header + sizeof(uint32_t);
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"mp4 atom: %*s @%O:%uL",
4, atom_name, mp4->offset, atom_size);
@@ -1068,7 +1068,7 @@ ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, off_t start_offset)
mp4->mdat_data.buf->file_pos = start_offset;
mp4->content_length += atom_data_size;
- ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"mdat new offset @%O:%O", start_offset, atom_data_size);
atom_header = mp4->mdat_atom_header;
@@ -2179,7 +2179,7 @@ ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4,
while (entry < end) {
count = ngx_mp4_get_32value(entry->count);
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+ ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"start:%uD, count:%uD, offset:%uD",
start_sample, count, ngx_mp4_get_32value(entry->offset));