X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=9b7d5edb51e1823d712d29434d391a11fbb0dc86;hb=be5f249c742d9fd6505085ee686c696f92575b77;hp=e7dbcc7953164fd4f5b81d8ed993caef6f89f912;hpb=106252353bf277d64180c6748b3056b1d91e1a63;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index e7dbcc79..9b7d5edb 100644
--- a/mp4.c
+++ b/mp4.c
@@ -15,12 +15,8 @@
 struct mp4_track {
 	bool is_audio;
 	int32_t channelCount;
-	int32_t sampleSize;
 	uint16_t sampleRate;
 
-	/* stsd */
-	int32_t stsd_entry_count;
-
 	/* stsz */
 	int32_t stsz_sample_size;
 	int32_t stsz_sample_count;
@@ -41,9 +37,6 @@ struct mp4_track {
 	int32_t stco_entry_count;
 	int32_t *stco_chunk_offset;
 
-	uint32_t maxBitrate;
-	uint32_t avgBitrate;
-
 	uint32_t timeScale;
 	uint64_t duration;
 };
@@ -558,7 +551,7 @@ static int32_t read_mp4a(struct mp4 *f)
 	read_int32(f);	/* reserved */
 
 	t->channelCount = read_int16(f);
-	t->sampleSize = read_int16(f);
+	read_int16(f);
 
 	read_int16(f);
 	read_int16(f);
@@ -573,7 +566,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;
 
@@ -585,10 +578,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;