RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
David Conrad 2010-07-02 16:41:38 +00:00 committed by Aurelien Jacobs
parent 7a617a8634
commit 41c1ccc332
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskadec.c
View File

@ -1776,7 +1776,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (matroska->prev_pkt && if (matroska->prev_pkt &&
timecode != AV_NOPTS_VALUE && timecode != AV_NOPTS_VALUE &&
matroska->prev_pkt->pts == timecode && 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); matroska_merge_packets(matroska->prev_pkt, pkt);
else { else {
dynarray_add(&matroska->packets,&matroska->num_packets,pkt); dynarray_add(&matroska->packets,&matroska->num_packets,pkt);