mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-01 04:12:14 +00:00
matroskadec: don't merge packets which have no timestamp
Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
72ab9d7f60
commit
21a115d17b
@ -1640,6 +1640,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
|
||||
matroska_fix_ass_packet(matroska, pkt, duration);
|
||||
|
||||
if (matroska->prev_pkt &&
|
||||
timecode != AV_NOPTS_VALUE &&
|
||||
matroska->prev_pkt->pts == timecode &&
|
||||
matroska->prev_pkt->stream_index == st->index)
|
||||
matroska_merge_packets(matroska->prev_pkt, pkt);
|
||||
|
Loading…
Reference in New Issue
Block a user