mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6': asfdec: increment nb_streams right after the stream allocation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
40e8ade9eb
|
@ -745,6 +745,7 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable *
|
||||||
if (!asf->asf_st[asf->nb_streams])
|
if (!asf->asf_st[asf->nb_streams])
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
asf_st = asf->asf_st[asf->nb_streams];
|
asf_st = asf->asf_st[asf->nb_streams];
|
||||||
|
asf->nb_streams++;
|
||||||
asf_st->stream_index = stream_index;
|
asf_st->stream_index = stream_index;
|
||||||
asf_st->index = st->index;
|
asf_st->index = st->index;
|
||||||
asf_st->indexed = 0;
|
asf_st->indexed = 0;
|
||||||
|
@ -785,7 +786,6 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable *
|
||||||
avio_skip(pb, err_data_len);
|
avio_skip(pb, err_data_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
asf->nb_streams++;
|
|
||||||
align_position(pb, asf->offset, size);
|
align_position(pb, asf->offset, size);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue