[FFmpeg-soc] [soc]: r1090 - matroska/matroskaenc.c
conrad
subversion at mplayerhq.hu
Mon Aug 20 21:52:06 CEST 2007
Author: conrad
Date: Mon Aug 20 21:52:06 2007
New Revision: 1090
Log:
Use num_entries directly rather than mixing it with a local copy
Modified:
matroska/matroskaenc.c
Modified: matroska/matroskaenc.c
==============================================================================
--- matroska/matroskaenc.c (original)
+++ matroska/matroskaenc.c Mon Aug 20 21:52:06 2007
@@ -262,7 +262,6 @@ static mkv_seekhead * mkv_start_seekhead
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_se
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_
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;
}
More information about the FFmpeg-soc
mailing list