mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
matroskadec: merge only SSA packets together
fixes issue 2052 patch by David Conrad Originally committed as revision 24004 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7a617a8634
commit
41c1ccc332
@ -1776,7 +1776,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
|
||||
if (matroska->prev_pkt &&
|
||||
timecode != AV_NOPTS_VALUE &&
|
||||
matroska->prev_pkt->pts == timecode &&
|
||||
matroska->prev_pkt->stream_index == st->index)
|
||||
matroska->prev_pkt->stream_index == st->index &&
|
||||
st->codec->codec_id == CODEC_ID_SSA)
|
||||
matroska_merge_packets(matroska->prev_pkt, pkt);
|
||||
else {
|
||||
dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
|
||||
|
Loading…
Reference in New Issue
Block a user