diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 06:53:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 06:53:38 +0100 |
| commit | 3b0b8c65313c4e47bf1662ecca64009aa3825024 (patch) | |
| tree | 20a50a27cf6a6e1a1d3fec401526ef6e6776ac13 /libavformat | |
| parent | cee1568ae18696919ad9cfea1d536364e4d53d9b (diff) | |
| parent | 1f625431e2bb9564760fba3ab8077ae07ce7c7a1 (diff) | |
| download | ffmpeg-3b0b8c65313c4e47bf1662ecca64009aa3825024.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
vorbis: Avoid some out-of-bounds reads
vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
vp3: fix streams with non-zero last coefficient
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f5894124bc..e45fd90278 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1169,7 +1169,6 @@ static void matroska_convert_tags(AVFormatContext *s) static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) { EbmlList *seekhead_list = &matroska->seekhead; - MatroskaSeekhead *seekhead = seekhead_list->elem; uint32_t level_up = matroska->level_up; int64_t before_pos = avio_tell(matroska->ctx->pb); uint32_t saved_id = matroska->current_id; @@ -1182,6 +1181,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) return; for (i=0; i<seekhead_list->nb_elem; i++) { + MatroskaSeekhead *seekhead = seekhead_list->elem; int64_t offset = seekhead[i].pos + matroska->segment_start; if (seekhead[i].pos <= before_pos |