diff options
| author | Mika Raento <mika.raento@elisa.fi> | 2014-09-01 20:10:03 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 18:40:32 +0200 |
| commit | 0484d7ad7ef7f4ce51525a95cc5b74d7e6c213a0 (patch) | |
| tree | da4de481c9165856e8cabde9887325a4c6729a1d /libavformat | |
| parent | 85b829bff9c31178b2d70e39279a397795ce25cf (diff) | |
| download | ffmpeg-0484d7ad7ef7f4ce51525a95cc5b74d7e6c213a0.tar.gz | |
segment: don't access outside seg->frames array
Fixes wrong number of segments output and undefined memory access.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 58e0402e02ae5e466c33b9465c1465fdee68d342)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index ad313a316f..9b4b44f514 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -666,7 +666,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) end_pts = seg->segment_count < seg->nb_times ? seg->times[seg->segment_count] : INT64_MAX; } else if (seg->frames) { - start_frame = seg->segment_count <= seg->nb_frames ? + start_frame = seg->segment_count < seg->nb_frames ? seg->frames[seg->segment_count] : INT_MAX; } else { end_pts = seg->time * (seg->segment_count+1); |