From patchwork Wed Feb 17 10:13:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25699 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D6CAA448D26 for ; Wed, 17 Feb 2021 12:21:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC50968A67E; Wed, 17 Feb 2021 12:21:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3712268A640 for ; Wed, 17 Feb 2021 12:21:36 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id w4so1593875wmi.4 for ; Wed, 17 Feb 2021 02:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=9/kZCKKzbN5ewpoJf1DEh4IZ2d9oOt8Ar1Q1xcaW6rM=; b=TSIZ5Jz72dnpz2aNQy75GoB4xl8qtC4CdOfTMrZAlN4sa8wEteJHM7PZwhezUSAokw y+6PiSlkbMilit4DE8tMeGO4q45TQioC1PssTc8gpS1OYf8jXNxKzktV1r2hWsA9+nAA OoMmEqmAS9TvGArN6yo4nbjLbotbhzb7F2pWt7vc2KBoQnPVXVIzqQ26/N2UUvCTxU// CTcN6NeEbcAAsNqtn2HCVS+GYiw5NBQX3+ojDbbIOblCjFEAoaMFCwrDzxphYeo1SdqZ X0sG2iX8LOvR1UMBSgvGHvm+hd4FHAyi8cHafxbJyqR5izOvxPqbRuyvLX87wwxTNlrZ rgwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=9/kZCKKzbN5ewpoJf1DEh4IZ2d9oOt8Ar1Q1xcaW6rM=; b=UzMrp5qRvvtmMIx1Ecp1JVszVQnkVuSDp0P/g8UX0musdo7G3kLCALg9x+aaHhxRmD 0H+Co9u6iClzVIUnn40YRUrMssdB8nT2Wnzec8XKGGUopV5TqMecnqC9PT20t68EgRvo D2lxkNuqytOIOlq4qPLKp8wnrsB8OH4p2aDwiWOTcW+SF6r93YcHuqX6qyFm4S2wbxET Bfdnb08JjxwHTyA3Qoucqoig1Adxsb4VJcYkjbLv0bEVV3rjnADtlnIylDevt4jewNAe XP/plXZwaeyS5uF89Gi9a0QPxl8opq4ExD3Be1Wudet1ba/mCRANVtequPDiedOEy5Sm Nk8A== X-Gm-Message-State: AOAM531FKLucaBZbchi9lGGDOxFmGW11sLlLSarGtSCGdYY9pyGZxyOb uxfWZuOdknOJidzh9GgyugiZJi8MZa0= X-Google-Smtp-Source: ABdhPJxS2vNV7ry6WkW9J1ZGIW0CAH88CUJTXk+hlMNBeHbX2SHYsXYKefXxRu1w81x8d4tnJrDlvw== X-Received: by 2002:a1c:2d0b:: with SMTP id t11mr6406837wmt.109.1613556867699; Wed, 17 Feb 2021 02:14:27 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:27 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:45 +0100 Message-Id: <20210217101356.1723370-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/19] avformat/matroskadec: Beautify setting default values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 636ed23f0d..b9c6047f56 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1114,28 +1114,29 @@ static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, int res; if (data) { - for (int i = 0; syntax[i].id; i++) + for (int i = 0; syntax[i].id; i++) { + void *dst = (char *)data + syntax[i].data_offset; switch (syntax[i].type) { case EBML_UINT: - *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u; + *(uint64_t *)dst = syntax[i].def.u; break; case EBML_SINT: - *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; + *(int64_t *) dst = syntax[i].def.i; break; case EBML_FLOAT: - *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f; + *(double *) dst = syntax[i].def.f; break; case EBML_STR: case EBML_UTF8: // the default may be NULL if (syntax[i].def.s) { - uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset); - *dst = av_strdup(syntax[i].def.s); - if (!*dst) + *(char**)dst = av_strdup(syntax[i].def.s); + if (!*(char**)dst) return AVERROR(ENOMEM); } break; } + } if (!matroska->levels[matroska->num_levels - 1].length) { matroska->num_levels--;