From 086b0ad8ca5d7e1420b8ffa3e757e31b23692e55 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Tue, 13 Mar 2007 00:16:31 +0000 Subject: [PATCH] set pkt->duration for laced packets too Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroska.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 548e84e29c..85232278cc 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -2593,6 +2593,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, pkt->pts = timecode; pkt->pos = pos; + pkt->duration = duration; if (matroska->tracks[track]->flags & MATROSKA_TRACK_REORDER) matroska_queue_packet_reordered(matroska, pkt, is_bframe); @@ -2692,14 +2693,6 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska, duration, is_keyframe, is_bframe, &track, &pkt); - if (pkt) - { - if (duration != AV_NOPTS_VALUE) - pkt->duration = duration; - else if (track >= 0 && track < matroska->num_tracks) - pkt->duration = matroska->tracks[track]->default_duration; - } - return res; }