From 91ca9690820818357a866c00286726020ce9efc9 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Wed, 5 Sep 2007 00:25:44 +0000 Subject: Use num_entries directly rather than mixing it with a local copy Originally committed as revision 10376 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskaenc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libavformat/matroskaenc.c') diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a167ccb25a..5d6bd03820 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -262,7 +262,6 @@ static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_off static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos) { mkv_seekhead_entry *entries = seekhead->entries; - int new_entry = seekhead->num_entries; // don't store more elements than we reserved space for if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries) @@ -272,11 +271,10 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid if (entries == NULL) return AVERROR(ENOMEM); - entries[new_entry].elementid = elementid; - entries[new_entry].segmentpos = filepos - seekhead->segment_offset; + entries[seekhead->num_entries ].elementid = elementid; + entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset; seekhead->entries = entries; - seekhead->num_entries++; return 0; } @@ -341,18 +339,16 @@ static mkv_cues * mkv_start_cues(offset_t segment_offset) static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos) { mkv_cuepoint *entries = cues->entries; - int new_entry = cues->num_entries; entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint)); if (entries == NULL) return AVERROR(ENOMEM); - entries[new_entry].pts = pkt->pts; - entries[new_entry].tracknum = pkt->stream_index + 1; - entries[new_entry].cluster_pos = cluster_pos - cues->segment_offset; + entries[cues->num_entries ].pts = pkt->pts; + entries[cues->num_entries ].tracknum = pkt->stream_index + 1; + entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset; cues->entries = entries; - cues->num_entries++; return 0; } -- cgit v1.2.3