generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: ensure that overlapping subtitles are not added to the index

Browse Source 
Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-09-09 12:07:10 +00:00
parent 20f7466550
commit 82360e670d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskadec.c
View File

@ -139,6 +139,7 @@ typedef struct {
EbmlList encodings; EbmlList encodings;
AVStream *stream; AVStream *stream;
int64_t end_timecode;
} MatroskaTrack; } MatroskaTrack;
typedef struct { typedef struct {
@ -1462,8 +1463,12 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (cluster_time != (uint64_t)-1 if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || cluster_time >= -block_time)) { && (block_time >= 0 || cluster_time >= -block_time)) {
timecode = cluster_time + block_time; timecode = cluster_time + block_time;
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE
&& timecode < track->end_timecode)
is_keyframe = 0; /* overlapping subtitles are not key frame */
if (is_keyframe) if (is_keyframe)
av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME); av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME);
track->end_timecode = FFMAX(track->end_timecode, timecode+duration);
} }
if (matroska->skip_to_keyframe) { if (matroska->skip_to_keyframe) {