diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:43:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:43:56 +0200 |
| commit | 40e8ade9ebda8286a0291c575c874755670ce81f (patch) | |
| tree | 8d0e0b22cbe9d04da4e590a8a0d07bc20af081f4 | |
| parent | cd4c878934a632dba2fe75a78e843b0f729fc79f (diff) | |
| parent | aed7715b8fa295980c221f1cd095d42cd3bd74a6 (diff) | |
| download | ffmpeg-40e8ade9ebda8286a0291c575c874755670ce81f.tar.gz | |
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
asfdec: increment nb_streams right after the stream allocation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/asfdec_o.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 4052a76062..3185a207a3 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -745,6 +745,7 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable * if (!asf->asf_st[asf->nb_streams]) return AVERROR(ENOMEM); asf_st = asf->asf_st[asf->nb_streams]; + asf->nb_streams++; asf_st->stream_index = stream_index; asf_st->index = st->index; asf_st->indexed = 0; @@ -785,7 +786,6 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable * avio_skip(pb, err_data_len); } - asf->nb_streams++; align_position(pb, asf->offset, size); return 0; |