mirror of https://git.ffmpeg.org/ffmpeg.git
set pkt->duration for laced packets too
Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9b54ab15e7
commit
086b0ad8ca
|
@ -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,
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue