From 1c0a472630838c3b32231e646ad44e8afd313a66 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 25 Mar 2011 12:00:17 +0100 Subject: [PATCH] Revert "matroskadec: set default duration for simple block" This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea. This has been implemented differently by aurel already --- libavformat/matroskadec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2bb121517..3358e038f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1859,8 +1859,6 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) for (i=0; inb_elem; i++) if (blocks[i].bin.size > 0 && blocks[i].bin.data) { int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; - if (!blocks[i].non_simple) - blocks[i].duration = AV_NOPTS_VALUE; res=matroska_parse_block(matroska, blocks[i].bin.data, blocks[i].bin.size, blocks[i].bin.pos, cluster.timecode, -- 2.11.0