diff options
| author | David Conrad <lessen42@gmail.com> | 2010-07-02 16:41:38 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-07-02 16:41:38 +0000 |
| commit | 41c1ccc332eba2785a84b883dee96d214a41db2c (patch) | |
| tree | 4792998e6e37d8eae40c3916da8b111673b24279 | |
| parent | 7a617a86348d690cc63f36f409d53ff60b7d6fba (diff) | |
| download | ffmpeg-41c1ccc332eba2785a84b883dee96d214a41db2c.tar.gz | |
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
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4430e7bfea..954ef3b863 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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); |