Commit d766800b authored by Michael Niedermayer's avatar Michael Niedermayer

dont set random timestamps if they are not known

Originally committed as revision 5219 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 78a11456
......@@ -2417,7 +2417,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
if (res == 0) {
for (n = 0; n < laces; n++) {
uint64_t timecode = 0;
uint64_t timecode = AV_NOPTS_VALUE;
pkt = av_mallocz(sizeof(AVPacket));
/* XXX: prevent data copy... */
......@@ -2425,10 +2425,8 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
res = AVERROR_NOMEM;
break;
}
if (cluster_time != (uint64_t)-1) {
if (block_time < 0 && (-block_time) > cluster_time)
timecode = cluster_time;
else
if (cluster_time != (uint64_t)-1 && n == 0) {
if (cluster_time + block_time >= 0)
timecode = cluster_time + block_time;
}
/* FIXME: duration */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment