From patchwork Fri Jun 26 00:47:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20614 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 6444644BC8F for ; Fri, 26 Jun 2020 03:47:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CEDB6881F3; Fri, 26 Jun 2020 03:47:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77F4D687FAA for ; Fri, 26 Jun 2020 03:47:37 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id d10so3598608pls.5 for ; Thu, 25 Jun 2020 17:47:37 -0700 (PDT) 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; bh=Oqm8gd8oj+N18JKosQW0rIs9z1dfObWFlTK5lSqktOA=; b=mHa2lDFDT3d9AQwpFKM8lxq73JerVjZ4E1pXnJ1yk2BoBEuBtOLDDUA3F3TpmeV+lI JkD8gMtp8yxj4SBaI9/Qs4EgDtkfl6bR7ugev+6oPZHIgQGfUEAcTMcopcEICfK+V6Gk D2q7pcCFJWDn40QHFkwUQVjLheIYg1xMb9zHOrHxBMyks+7zfWN/bE2k2qSj1Ty7PA8Q ADtD5hYy9jibr8So9M9YYgt9CooqGN+Y3vpJZGY7z8OpD+1CAAgHYGz/gfF4BcFyoF/l KvVDv8pdKVQ1lZX1bWFbetvsXkJLIHYnAIfROFmw6sTVq25MwWtgECo7X6r1iQUvXB08 937Q== 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; bh=Oqm8gd8oj+N18JKosQW0rIs9z1dfObWFlTK5lSqktOA=; b=XQMY183+LH7PO8y0KpMTJCa6jgLOY406qIj14XlBOzWwVeDXt1EaQ8avzDg0M+9Um7 s0TfyZ8A9i3DU8nKih10oObwzEUwk1XrFm+PGLMi60beF44cVdu2pmAN3W0ouyi2jwFi PB9EA+LGpByuV7IdnR9pKtO4kSUWvcoel8ef73L6zbCCfU1n7UkOhumvx0pjGQIufo1w neQAKbMdwXMxbrJtgWk7+qPZzTFet28Cqs+xR127JAlw5c9m78xLl3wJp+KIGH5kq/Uz X+pS0YOT7XRnVCtGg1OkCNPyRQvNoe4uM454DNfU0d3PhUhHIvada1sp+A3OkajCuioD J3aQ== X-Gm-Message-State: AOAM533u0cuapDxSft5FBto/YiivDASqTtHLrrVK2DN0cO1So59QUfwB XGdAAurLjbnaYMJ6GxKPp7kXjDKN X-Google-Smtp-Source: ABdhPJxeiqxhmNM/wtURxSE1VqwCXJcAp7E0ngc4bFY3+H5lunLoo8ULvnBUGEqOdv7SOsb8pZao0A== X-Received: by 2002:a17:90a:f198:: with SMTP id bv24mr685265pjb.206.1593132455338; Thu, 25 Jun 2020 17:47:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f20sm3942768pfn.51.2020.06.25.17.47.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2020 17:47:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 08:47:22 +0800 Message-Id: <1593132446-21202-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593132446-21202-1-git-send-email-lance.lmwang@gmail.com> References: <1593132446-21202-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/dvbsubdec: prefer to use variable instead of type for sizeof 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/dvbsubdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index af6c78a..263ba59 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -813,7 +813,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou ret = AVERROR(ENOMEM); goto fail; } - memcpy(rect->data[1], clut_table, (1 << region->depth) * sizeof(uint32_t)); + memcpy(rect->data[1], clut_table, (1 << region->depth) * sizeof(*clut_table)); rect->data[0] = av_malloc(region->buf_size); if (!rect->data[0]) { @@ -1073,11 +1073,11 @@ static int dvbsub_parse_clut_segment(AVCodecContext *avctx, clut = get_clut(ctx, clut_id); if (!clut) { - clut = av_malloc(sizeof(DVBSubCLUT)); + clut = av_malloc(sizeof(*clut)); if (!clut) return AVERROR(ENOMEM); - memcpy(clut, &default_clut, sizeof(DVBSubCLUT)); + memcpy(clut, &default_clut, sizeof(*clut)); clut->id = clut_id; clut->version = -1; @@ -1163,7 +1163,7 @@ static int dvbsub_parse_region_segment(AVCodecContext *avctx, region = get_region(ctx, region_id); if (!region) { - region = av_mallocz(sizeof(DVBSubRegion)); + region = av_mallocz(sizeof(*region)); if (!region) return AVERROR(ENOMEM); @@ -1244,7 +1244,7 @@ static int dvbsub_parse_region_segment(AVCodecContext *avctx, object = get_object(ctx, object_id); if (!object) { - object = av_mallocz(sizeof(DVBSubObject)); + object = av_mallocz(sizeof(*object)); if (!object) return AVERROR(ENOMEM); @@ -1255,7 +1255,7 @@ static int dvbsub_parse_region_segment(AVCodecContext *avctx, object->type = (*buf) >> 6; - display = av_mallocz(sizeof(DVBSubObjectDisplay)); + display = av_mallocz(sizeof(*display)); if (!display) return AVERROR(ENOMEM); @@ -1352,7 +1352,7 @@ static int dvbsub_parse_page_segment(AVCodecContext *avctx, } if (!display) { - display = av_mallocz(sizeof(DVBSubRegionDisplay)); + display = av_mallocz(sizeof(*display)); if (!display) return AVERROR(ENOMEM); }