diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:08:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:08:15 +0100 |
| commit | c0cbf3af0188d06a11c74b3ab2402de1c248a76b (patch) | |
| tree | 4be83b2a1891d611c6543adaa400f6f438dfbe51 /libavformat | |
| parent | 870e74dc435e76cecdbe936329a04845d680ed29 (diff) | |
| parent | 3b0b8c65313c4e47bf1662ecca64009aa3825024 (diff) | |
| download | ffmpeg-c0cbf3af0188d06a11c74b3ab2402de1c248a76b.tar.gz | |
Merge branch 'release/0.8' into release/0.7
* release/0.8:
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
Update for 0.8.9
vp3: fix regression with mplayer-crash.ogv
h264: fix init of topleft ref/mv. Fixes Ticket778
Update for 0.8.8
Conflicts:
Doxyfile
RELEASE
VERSION
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 ffc189825e..7a57648331 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 |