[FFmpeg-cvslog] r15453 - trunk/libavformat/matroskadec.c

[aurel]

Author: aurel
Date: Mon Sep 29 00:58:53 2008
New Revision: 15453

Log:
matroskadec: set duration only for CODEC_ID_TEXT subtitles

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Mon Sep 29 00:58:53 2008
@@ -1621,9 +1621,9 @@ static int matroska_parse_block(Matroska
 
                 pkt->pts = timecode;
                 pkt->pos = pos;
-                if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE)
+                if (st->codec->codec_id == CODEC_ID_TEXT)
                     pkt->convergence_duration = duration;
-                else
+                else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
                     pkt->duration = duration;
 
                 if (st->codec->codec_id == CODEC_ID_SSA)