X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=0834b03dbff885b6d851879bc57dc5405c8857f4;hb=16eb10820a9e434334b17748abd69933d9ff37bd;hp=8d58c1f2b58270371808e020eb0f5eb9855b9b26;hpb=9f41e0a646faa238673bfdbe4dbdccb9cea37b7d;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index 8d58c1f2..0834b03d 100644
--- a/mp4.c
+++ b/mp4.c
@@ -18,9 +18,6 @@ struct mp4_track {
 	int32_t sampleSize;
 	uint16_t sampleRate;
 
-	/* stsd */
-	int32_t stsd_entry_count;
-
 	/* stsz */
 	int32_t stsz_sample_size;
 	int32_t stsz_sample_count;
@@ -41,14 +38,6 @@ struct mp4_track {
 	int32_t stco_entry_count;
 	int32_t *stco_chunk_offset;
 
-	/* ctts */
-	int32_t ctts_entry_count;
-	int32_t *ctts_sample_count;
-	int32_t *ctts_sample_offset;
-
-	uint32_t maxBitrate;
-	uint32_t avgBitrate;
-
 	uint32_t timeScale;
 	uint64_t duration;
 };
@@ -488,34 +477,6 @@ static int32_t read_stts(struct mp4 *f)
 	return 1;
 }
 
-static int32_t read_ctts(struct mp4 *f)
-{
-	int32_t i;
-	struct mp4_track *t;
-
-	if (f->total_tracks == 0)
-		return f->error++;
-	t = f->track[f->total_tracks - 1];
-	if (t->ctts_entry_count)
-		return 0;
-
-	read_char(f);	/* version */
-	read_int24(f);	/* flags */
-	t->ctts_entry_count = read_int32(f);
-
-	t->ctts_sample_count = para_malloc(t->ctts_entry_count
-		* sizeof (int32_t));
-	t->ctts_sample_offset = para_malloc(t->ctts_entry_count
-		* sizeof (int32_t));
-
-	/* CVE-2017-9257 */
-	for (i = 0; i < t->ctts_entry_count && !f->stream->read_error; i++) {
-		t->ctts_sample_count[i] = read_int32(f);
-		t->ctts_sample_offset[i] = read_int32(f);
-	}
-	return 1;
-}
-
 static int32_t read_stsc(struct mp4 *f)
 {
 	int32_t i;
@@ -606,7 +567,7 @@ static int32_t read_mp4a(struct mp4 *f)
 
 static int32_t read_stsd(struct mp4 *f)
 {
-	int32_t i;
+	int32_t i, entry_count;
 	uint8_t header_size = 0;
 	struct mp4_track *t;
 
@@ -618,10 +579,10 @@ static int32_t read_stsd(struct mp4 *f)
 	read_char(f);	/* version */
 	read_int24(f);	/* flags */
 
-	t->stsd_entry_count = read_int32(f);
+	entry_count = read_int32(f);
 
 	/* CVE-2017-9253 */
-	for (i = 0; i < t->stsd_entry_count && !f->stream->read_error; i++) {
+	for (i = 0; i < entry_count && !f->stream->read_error; i++) {
 		uint64_t skip = get_position(f);
 		uint64_t size;
 		uint8_t atom_type = 0;
@@ -1016,9 +977,6 @@ static int32_t atom_read(struct mp4 *f, int32_t size, uint8_t atom_type)
 	} else if (atom_type == ATOM_STTS) {
 		/* time to sample box */
 		read_stts(f);
-	} else if (atom_type == ATOM_CTTS) {
-		/* composition offset box */
-		read_ctts(f);
 	} else if (atom_type == ATOM_STSC) {
 		/* sample to chunk box */
 		read_stsc(f);
@@ -1152,8 +1110,6 @@ void mp4_close(struct mp4 *ff)
 			free(ff->track[i]->stsc_samples_per_chunk);
 			free(ff->track[i]->stsc_sample_desc_index);
 			free(ff->track[i]->stco_chunk_offset);
-			free(ff->track[i]->ctts_sample_count);
-			free(ff->track[i]->ctts_sample_offset);
 			free(ff->track[i]);
 		}
 	}