Changeset 44fc4434028945e23a3157aaf2e6ba18babed362

Timestamp:

01/03/08 19:31:32 (9 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1204396292 +0000

git-parent:

[34610e09541e4fe48dd9767604dd2f11a0cbc41b]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1204396292 +0000

Message:

Fix calloc usage

Files:

• modules/demux/mp4/libmp4.c (modified) (10 diffs)

modules/demux/mp4/libmp4.c

@@ -793 +793 @@
-
-    p_box->data.p_stts->i_sample_count =
-sizeof( uint32_t ), p_box->data.p_stts->i_entry_count
+p_box->data.p_stts->i_entry_count, sizeof(uint32_t)
-    p_box->data.p_stts->i_sample_delta =
-sizeof( uint32_t ), p_box->data.p_stts->i_entry_count
+p_box->data.p_stts->i_entry_count, sizeof(uint32_t)
-
-    for( i = 0; (i < p_box->data.p_stts->i_entry_count )&&( i_read >=8 ); i++ )
@@ -827 +827 @@
-
-    p_box->data.p_ctts->i_sample_count =
-sizeof( uint32_t ), p_box->data.p_ctts->i_entry_count
+p_box->data.p_ctts->i_entry_count, sizeof(uint32_t)
-    p_box->data.p_ctts->i_sample_offset =
-sizeof( uint32_t ), p_box->data.p_ctts->i_entry_count
+p_box->data.p_ctts->i_entry_count, sizeof(uint32_t)
-
-    for( i = 0; (i < p_box->data.p_ctts->i_entry_count )&&( i_read >=8 ); i++ )
@@ -1452 +1452 @@
-
-    p_box->data.p_stsz->i_entry_size =
-sizeof( uint32_t ), p_box->data.p_stsz->i_sample_count
+p_box->data.p_stsz->i_sample_count, sizeof(uint32_t)
-
-    if( !p_box->data.p_stsz->i_sample_size )
@@ -1487 +1487 @@
-
-    p_box->data.p_stsc->i_first_chunk =
-sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count
+p_box->data.p_stsc->i_entry_count, sizeof(uint32_t)
-    p_box->data.p_stsc->i_samples_per_chunk =
-sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count
+p_box->data.p_stsc->i_entry_count, sizeof(uint32_t)
-    p_box->data.p_stsc->i_sample_description_index =
-sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count
+p_box->data.p_stsc->i_entry_count, sizeof(uint32_t)
-
-    for( i = 0; (i < p_box->data.p_stsc->i_entry_count )&&( i_read >= 12 );i++ )
@@ -1526 +1526 @@
-
-    p_box->data.p_co64->i_chunk_offset =
-sizeof( uint64_t ), p_box->data.p_co64->i_entry_count
+p_box->data.p_co64->i_entry_count, sizeof(uint64_t)
-
-    for( i = 0; i < p_box->data.p_co64->i_entry_count; i++ )
@@ -1572 +1572 @@
-
-    p_box->data.p_stss->i_sample_number =
-sizeof( uint32_t ), p_box->data.p_stss->i_entry_count
+p_box->data.p_stss->i_entry_count, sizeof(uint32_t)
-
-    for( i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 4 ); i++ )
@@ -1607 +1607 @@
-
-    p_box->data.p_stsh->i_shadowed_sample_number =
-sizeof( uint32_t ), p_box->data.p_stsh->i_entry_count
+p_box->data.p_stsh->i_entry_count, sizeof(uint32_t)
-
-    p_box->data.p_stsh->i_sync_sample_number =
-sizeof( uint32_t ), p_box->data.p_stsh->i_entry_count
+p_box->data.p_stsh->i_entry_count, sizeof(uint32_t)
-
-
@@ -1643 +1643 @@
-
-    p_box->data.p_stdp->i_priority =
-sizeof( uint16_t ), i_read / 2
+i_read / 2, sizeof(uint16_t)
-
-    for( i = 0; i < i_read / 2 ; i++ )
@@ -1676 +1676 @@
-
-    p_box->data.p_padb->i_reserved1 =
-
+
+
-    p_box->data.p_padb->i_pad2 =
-
+
+
-    p_box->data.p_padb->i_reserved2 =
-
+
+
-    p_box->data.p_padb->i_pad1 =
-
+
+
-
-
@@ -1723 +1727 @@
-
-    p_box->data.p_elst->i_segment_duration =
-sizeof( uint64_t ), p_box->data.p_elst->i_entry_count
+p_box->data.p_elst->i_entry_count, sizeof(uint64_t)
-    p_box->data.p_elst->i_media_time =
-sizeof( int64_t ),  p_box->data.p_elst->i_entry_count
+p_box->data.p_elst->i_entry_count, sizeof(uint64_t)
-    p_box->data.p_elst->i_media_rate_integer =
-sizeof( uint16_t ), p_box->data.p_elst->i_entry_count
+p_box->data.p_elst->i_entry_count, sizeof(uint16_t)
-    p_box->data.p_elst->i_media_rate_fraction=
-sizeof( uint16_t ), p_box->data.p_elst->i_entry_count
+p_box->data.p_elst->i_entry_count, sizeof(uint16_t)
-
-