Commit 9c729f4e authored by aurel's avatar aurel

set pkt->duration for laced packets too

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8366 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 46459fa7
...@@ -2593,6 +2593,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, ...@@ -2593,6 +2593,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
pkt->pts = timecode; pkt->pts = timecode;
pkt->pos = pos; pkt->pos = pos;
pkt->duration = duration;
if (matroska->tracks[track]->flags & MATROSKA_TRACK_REORDER) if (matroska->tracks[track]->flags & MATROSKA_TRACK_REORDER)
matroska_queue_packet_reordered(matroska, pkt, is_bframe); matroska_queue_packet_reordered(matroska, pkt, is_bframe);
...@@ -2692,14 +2693,6 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska, ...@@ -2692,14 +2693,6 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
duration, is_keyframe, is_bframe, duration, is_keyframe, is_bframe,
&track, &pkt); &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; return res;
} }
......
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