[SCM] libav/experimental: matroskadec: ensure that overlapping subtitles are not added to the index
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:29:51 UTC 2013
The following commit has been merged in the experimental branch:
commit 82360e670d2d1e6092257272d569efcdcb94cb2c
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Tue Sep 9 12:07:10 2008 +0000
matroskadec: ensure that overlapping subtitles are not added to the index
Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index a6a682f..948238c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -139,6 +139,7 @@ typedef struct {
EbmlList encodings;
AVStream *stream;
+ int64_t end_timecode;
} MatroskaTrack;
typedef struct {
@@ -1462,8 +1463,12 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || 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)
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) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list