diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-10-02 21:14:56 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-10-02 21:14:56 +0000 |
| commit | 21a115d17bafa1c07f3959af3f6726eb1cb27bc8 (patch) | |
| tree | 1f977ab968fc170f034f330f2a2f064ecc4dbb29 | |
| parent | 72ab9d7f604e3ef0f4f418a072d86602f9d9b10a (diff) | |
| download | ffmpeg-21a115d17bafa1c07f3959af3f6726eb1cb27bc8.tar.gz | |
matroskadec: don't merge packets which have no timestamp
Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a0e259c3b5..442a5a013a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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); |