virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avformat/matroskadec: Fix OOM on long streams

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-12-26 03:16:01 +01:00
parent a7946c8964
commit b347ca9341
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@ -3234,10 +3234,12 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE && if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE &&
timecode < track->end_timecode) timecode < track->end_timecode)
is_keyframe = 0; /* overlapping subtitles are not key frame */ is_keyframe = 0; /* overlapping subtitles are not key frame */
if (is_keyframe) if (is_keyframe) {
ff_reduce_index(matroska->ctx, st->index);
av_add_index_entry(st, cluster_pos, timecode, 0, 0, av_add_index_entry(st, cluster_pos, timecode, 0, 0,
AVINDEX_KEYFRAME); AVINDEX_KEYFRAME);
} }
}
if (matroska->skip_to_keyframe && if (matroska->skip_to_keyframe &&
track->type != MATROSKA_TRACK_TYPE_SUBTITLE) { track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {