From patchwork Sun Oct 2 16:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 38522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp866469pzh; Sun, 2 Oct 2022 09:28:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FlQjNx3nNMCAs0bwS1c48RdwTjaFs1taWgFa697whp44k4pPaUTX6dhgCoO3OkXuDF0bq X-Received: by 2002:a17:906:fd8a:b0:75d:c79a:47c8 with SMTP id xa10-20020a170906fd8a00b0075dc79a47c8mr12390184ejb.389.1664728106997; Sun, 02 Oct 2022 09:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664728106; cv=none; d=google.com; s=arc-20160816; b=0COPNYZV/LdtBSLzbxoW+tyGDl3lS8EQJB4VbmmywaoE7cDZ6sLUTAdwSo94/zZzNO e3AzR6JypF+8y6jxFdtQ3FXNrspxiHre/6OPZ9x+yP3ReJIQU/gmS4IMnKpqgsCFlDd3 T1KJ3b2W31od9Bpm45zdl8Si+0FJLCmAmexAX/eERcbYNwbAiGxhNkkW9MhNAz+h29je OalIdSWLYgvYxtsMnQSQ6Vd6ioPfd41PEE0M1Axd7BVjSkTBiI7as9QLRLlALEOU6BUM voxBFJaJvULZuVQpitNY4YN3rlZFxsbh9SBCxea45KURLysubXJYlWn20K9/j6a/2FGQ Uuog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=idY+3wY4y2ebOJBKpolvOf0o3k5KVjvP76wYN9J+j1s=; b=InjKjz7wHSk5PErwhbQaQeMjRlbZMdoLR3teEaVOncQMwmo3iLfJ0k4dcJqQMH+AcT 9CUKyO+BrvBk4+hI/3lMVpT2NkDs2vqOe1Zdy3B4toz17LUXpczu8lX53s6yI009wVE9 IHVIFto6CJyZnsDMOlqLCmUDtYgUTFOD/ikkkNo+ezl0D2EFS0uzYb/Q/fzXYPqWs3TV te5EsBAbn701feN1HMAYYPfGT2oV8yHnJ+UpZh42zCt08NMy8FHLGxIjvROf9KaPF4na i+8LCw5BQo9FJb759LWWXEXBn2mKgFNmuJ98HaLqxApd3nDRp27pQp7rt46HwR31jvGV Cp2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y40-20020a50bb2b000000b00447c58358d7si6146665ede.616.2022.10.02.09.28.26; Sun, 02 Oct 2022 09:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 908D668BBCA; Sun, 2 Oct 2022 19:28:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9072468BB94 for ; Sun, 2 Oct 2022 19:28:16 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id lx7so8091981pjb.0 for ; Sun, 02 Oct 2022 09:28:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=jIM1k/dRYWhmf99rV0Nmk5T/vR/Jw8NkVwlJ/zgH6+w=; b=lqanEe43r1wv9Angag8ie36NugOYX9jYf+Ehv6wz9nQPyiDw9zQV6a0ogAa7x2h+I/ g+nUnJVFPaq5h3vbYEsYy2t/hiV+Dy9W150+4k5W1eHWHkdh5HSMrETPziaMB2iYN1V3 clCMBt9YzGeIxolDw+Xs+O0o96i/bOb/cQF5/ndMNN7JSXBD9CYYgRqtWXKqbs/3f7Iu KdpFJdixG+5pU6xxKDhpRH6qFR1uNp7c6Q7tHSAzGuPBxt40i8vbZlvLq7sPh9QDxI5B 5PASFLFuGY8rZpJI8jUBYYLtD7Dk6zOQMhToJMajwvi/Fe5VOM4FgBsM7drF2/hxk1Lg XpXw== X-Gm-Message-State: ACrzQf1E62zNbMCZEmAm6HdgquqoD8NV9codB+KBQcGealG4Ylar10Vl /aeP2h60b/d6B8qYB29fMJp/h4ANS1Q= X-Received: by 2002:a17:90a:5996:b0:203:1640:2dbf with SMTP id l22-20020a17090a599600b0020316402dbfmr8327319pji.150.1664728094163; Sun, 02 Oct 2022 09:28:14 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id j194-20020a636ecb000000b00434abd19eeasm5069979pgc.78.2022.10.02.09.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 09:28:13 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Sun, 02 Oct 2022 09:28:11 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 09:27:55 -0700 Message-Id: <20221002162755.8413-3-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221002162755.8413-1-pal@sandflow.com> References: <20221002162755.8413-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/imfdec: variable initialiaztion cosmetics X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2mbdNLZZZudQ From: Pierre-Anthony Lemieux --- libavformat/imf_cpl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c index 183e6dd84e..ad84a68b13 100644 --- a/libavformat/imf_cpl.c +++ b/libavformat/imf_cpl.c @@ -72,10 +72,9 @@ xmlNodePtr ff_imf_xml_get_child_element_by_name(xmlNodePtr parent, const char *n int ff_imf_xml_read_uuid(xmlNodePtr element, AVUUID uuid) { - xmlChar *element_text = NULL; int ret = 0; - element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); + xmlChar *element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); ret = av_uuid_urn_parse(element_text, uuid); if (ret) { av_log(NULL, AV_LOG_ERROR, "Invalid UUID\n"); @@ -88,10 +87,9 @@ int ff_imf_xml_read_uuid(xmlNodePtr element, AVUUID uuid) int ff_imf_xml_read_rational(xmlNodePtr element, AVRational *rational) { - xmlChar *element_text = NULL; int ret = 0; - element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); + xmlChar *element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); if (sscanf(element_text, "%i %i", &rational->num, &rational->den) != 2) { av_log(NULL, AV_LOG_ERROR, "Invalid rational number\n"); ret = AVERROR_INVALIDDATA; @@ -103,10 +101,9 @@ int ff_imf_xml_read_rational(xmlNodePtr element, AVRational *rational) int ff_imf_xml_read_uint32(xmlNodePtr element, uint32_t *number) { - xmlChar *element_text = NULL; int ret = 0; - element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); + xmlChar *element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); if (sscanf(element_text, "%" PRIu32, number) != 1) { av_log(NULL, AV_LOG_ERROR, "Invalid unsigned 32-bit integer"); ret = AVERROR_INVALIDDATA;