Skip to content

F
ffmpeg-mt
Commit babb71e5 authored by michael's avatar michael
Browse files
Options

dont set random timestamps if they are not known 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5219 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 960dda9a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
libavformat/matroska.c
View file @ babb71e5
...@@ -2417,7 +2417,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska, ...@@ -2417,7 +2417,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
if (res == 0) { if (res == 0) {
for (n = 0; n < laces; n++) { for (n = 0; n < laces; n++) {
uint64_t timecode = 0; uint64_t timecode = AV_NOPTS_VALUE;
pkt = av_mallocz(sizeof(AVPacket)); pkt = av_mallocz(sizeof(AVPacket));
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
...@@ -2425,10 +2425,8 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska, ...@@ -2425,10 +2425,8 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
res = AVERROR_NOMEM; res = AVERROR_NOMEM;
break; break;
} }
if (cluster_time != (uint64_t)-1) { if (cluster_time != (uint64_t)-1 && n == 0) {
if (block_time < 0 && (-block_time) > cluster_time) if (cluster_time + block_time >= 0)
timecode = cluster_time;
else
timecode = cluster_time + block_time; timecode = cluster_time + block_time;
} }
/* FIXME: duration */ /* 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