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

dont set random timestamps if they are not known

Browse Source 
Originally committed as revision 5219 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-03-25 19:51:12 +00:00
parent 78a11456a1
commit d766800b78
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/matroska.c
View File

@ -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,
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 */