[FFmpeg-cvslog] avformat/matroskadec: Remove redundant initialization

Andreas Rheinhardt git at videolan.org
Sun Jun 23 07:13:36 EEST 2019


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri May 17 00:29:53 2019 +0200| [f3ca3e7f19c86563c2d3bca82962567396b1cc13] | committer: James Almer

avformat/matroskadec: Remove redundant initialization

Every new element of an EbmlList is zeroed initially in
ebml_parse_elem, so that in particular a SimpleBlock's duration is
initialized to zero. Therefore it is unnecessary to initialize this
field again (for SimpleBlocks) in matroska_parse_cluster_incremental.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3ca3e7f19c86563c2d3bca82962567396b1cc13
---

 libavformat/matroskadec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d516ef37c7..b594bc4a95 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3491,8 +3491,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
             int is_keyframe = blocks[i].non_simple ? blocks[i].reference == INT64_MIN : -1;
             uint8_t* additional = blocks[i].additional.size > 0 ?
                                     blocks[i].additional.data : NULL;
-            if (!blocks[i].non_simple)
-                blocks[i].duration = 0;
+
             res = matroska_parse_block(matroska, blocks[i].bin.buf, blocks[i].bin.data,
                                        blocks[i].bin.size, blocks[i].bin.pos,
                                        matroska->current_cluster.timecode,



More information about the ffmpeg-cvslog mailing list