generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove last MAX_STREAMS from avienc.c

Browse Source 
Originally committed as revision 21500 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-01-28 03:37:22 +00:00
parent 14ca9cd0b0
commit 12f1b1fec4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/avienc.c
View File

@@ -50,6 +50,7 @@ typedef struct {
int64_t frames_hdr_strm; int64_t frames_hdr_strm;
int audio_strm_length; int audio_strm_length;
int packet_count; int packet_count;
int entry;
AVIIndex indexes; AVIIndex indexes;
} AVIStream ; } AVIStream ;
@@ -461,20 +462,24 @@ static int avi_write_idx1(AVFormatContext *s)
char tag[5]; char tag[5];
if (!url_is_streamed(pb)) { if (!url_is_streamed(pb)) {
AVIStream *avist;
AVIIentry* ie = 0, *tie; AVIIentry* ie = 0, *tie;
int entry[MAX_STREAMS];
int empty, stream_id = -1; int empty, stream_id = -1;
idx_chunk = ff_start_tag(pb, "idx1"); idx_chunk = ff_start_tag(pb, "idx1");
memset(&entry[0], 0, sizeof(entry)); for(i=0; i<s->nb_streams; i++){
avist= s->streams[i]->priv_data;
avist->entry=0;
}
do { do {
empty = 1; empty = 1;
for (i=0; i<s->nb_streams; i++) { for (i=0; i<s->nb_streams; i++) {
AVIStream *avist= s->streams[i]->priv_data; avist= s->streams[i]->priv_data;
if (avist->indexes.entry <= entry[i]) if (avist->indexes.entry <= avist->entry)
continue; continue;
tie = avi_get_ientry(&avist->indexes, entry[i]); tie = avi_get_ientry(&avist->indexes, avist->entry);
if (empty || tie->pos < ie->pos) { if (empty || tie->pos < ie->pos) {
ie = tie; ie = tie;
stream_id = i; stream_id = i;
@@ -482,13 +487,14 @@ static int avi_write_idx1(AVFormatContext *s)
empty = 0; empty = 0;
} }
if (!empty) { if (!empty) {
avist= s->streams[stream_id]->priv_data;
avi_stream2fourcc(&tag[0], stream_id, avi_stream2fourcc(&tag[0], stream_id,
s->streams[stream_id]->codec->codec_type); s->streams[stream_id]->codec->codec_type);
put_tag(pb, &tag[0]); put_tag(pb, &tag[0]);
put_le32(pb, ie->flags); put_le32(pb, ie->flags);
put_le32(pb, ie->pos); put_le32(pb, ie->pos);
put_le32(pb, ie->len); put_le32(pb, ie->len);
entry[stream_id]++; avist->entry++;
} }
} while (!empty); } while (!empty);
ff_end_tag(pb, idx_chunk); ff_end_tag(pb, idx_chunk);