From patchwork Fri Aug 30 01:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp136041vqb; Thu, 29 Aug 2024 19:30:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXYqY/KX6DpblDC7z0UrlARkyorD0eD0f3waJZOvbIrH23jrTxRIFsSdzjm0OLgH14dWcAZ35NPpcXSmtkl4MBw@gmail.com X-Google-Smtp-Source: AGHT+IGBr2nQEl+miHshzidOTSyYblw/KP6rAUMrdkf8yUHKpJWZhfHJqFLXVRty2lxKiywotdvn X-Received: by 2002:a2e:9fca:0:b0:2ef:1db2:c02c with SMTP id 38308e7fff4ca-2f6105b6d55mr25449171fa.10.1724985011398; Thu, 29 Aug 2024 19:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724985011; cv=none; d=google.com; s=arc-20240605; b=h+I+t2wCAqs0PoPHuIdrgDzqDUmO/80brm5+HUbOrYUkTZoTtdT85PC8bmh5SMANqM 6Krwbuf4CyrcAMTv9L+F8miXH5mDAitAoLw+Mbf3r4aI9RSAsK47C004eM5XmveHpGT2 4IrwOObHqXWvpx4b6SbazPeBmcgzxTOxRYi+gGaRw/3RpXGiOe1/Yb1vcH6rAbHtsnxW 1j2jTMiMVYrLGr6B+IvKCIUc0x0EutvYVaaSijkH4BkKNczR8rG5npRZQeMAhYAr018D jxQp3YFr+XpnjiMGVannkBYYXlPoLx9/gc0iqyUwob6jFBcAF1+GlV1y90dr4M62SE6d lryA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7MerVXroXvH7RkHqzdJIZEkzX6c7va03XxuD0bczPTM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=emezPQ4FbHgcP2a6GC5ZeA+E9I39Z32hRu9PJWRU/zElkH1ujDNXEnRW/AVCibeGrq iD+1efTIH0lcaoVsHWJQAD2IbaIkqnuQ1ZHxAbkmpYR7RSlkj/SU0bG+8YMWFAlxUbrp YxII1bSEd2NUcAuajV+cOltbGl4iF7FN761iYjTlRTI9sY1/2sj8gHHKtB5zFifGIaUO oGOZUEAPDpaxq/2bC4aI/K0mYsKfWJ9gas1elZRdJ5MtHb0kfEz+FH7Fs43qgkhPgd+G zAc5leDbcfh5mCn9dGLqsbqNdK/l8x3qVaKqJHUABlzN/O+6+y7qGsNYfmivwDVbPvqL P42g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=A4RMVf6h; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f615151b05si9315431fa.246.2024.08.29.19.30.11; Thu, 29 Aug 2024 19:30:11 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=A4RMVf6h; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DC4D68DEB0; Fri, 30 Aug 2024 04:13:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABE5168DD66 for ; Fri, 30 Aug 2024 04:13:00 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71456acebe8so1027402b3a.3 for ; Thu, 29 Aug 2024 18:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724980378; x=1725585178; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=YBE6iq9cttlQ7M0h7VI8wr8vPtlayqL1hMtwk8LVzGE=; b=A4RMVf6h+eb8D9P1QYsU34nKjcbq9kUgsUkRWTf6s0FT1xsi1EQ+B7DomC1aWhcmNl jZuTIMR0sKfVVJoo4gKMhItJjrYmqOoIoJKh+d0fGjyw6BWfpjcPdVLCyFBoe2/2BpPs SboEEbU92ZU6NUmU686fLblV9QyeltAogipHI6ljmW3eAVbTh0+pilzaiix3DEuFeAbo 4j0S2TOC23BgayBkooHWJZBgi4MvAe8YMtKBoHZvEJIepIXEaK0NCFwJ6p8BuVXWvgtX jUjBE5S/XKpEO52QMomqtqpPeenb6djgRsE+v0SBCHDBvrxF82L0GJkPPUiystpIJv10 N4XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724980378; x=1725585178; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YBE6iq9cttlQ7M0h7VI8wr8vPtlayqL1hMtwk8LVzGE=; b=dpdY7f98Q0jriKRMlGGAq8MxibUBbRiricDRTPZ9YmJpO3I+RL2h/PJaKxyJZPzk4K iOBrFcOw3Zyn5EeLWm0ccRA0+7I45rQ3oLvd3w47j2rU6eHnN/ZCwQnePckgHiwLxkTN V4pKyEisWacsofyA4I0uHcg3ZwTWyTlxPW0uqzc4pqINsp78ErIlXxUUwedInNcBZ7YV +Qbcm5zr+F7S+1d/X0vuJ8AfuH7uwOPEPzAPCEV7aLBeSlrctAz+BlZLWKJGkB1IqB0Z ZB0wQ16sb+9q4kI08SMa5yI4qrTmoGGMxXx9WO6PaANSAT6IhoQBERHTxKcx8s83C3DG m5ug== X-Gm-Message-State: AOJu0Yx+1svEP+OOuunLtf5NaEjVpPU308FKPWVa39ioE1UlU4JiwBeQ DVwE2bKn6nWZXpitXRTW6qD9wkNvI2Nm197E09T3WpW4Z2MT90Dl1EFYRw== X-Received: by 2002:a05:6a00:1796:b0:70a:fdd8:51f2 with SMTP id d2e1a72fcca58-715dfb697acmr5921639b3a.15.1724980377849; Thu, 29 Aug 2024 18:12:57 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-715e575c4fasm1722075b3a.200.2024.08.29.18.12.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 18:12:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2024 22:13:32 -0300 Message-ID: <20240830011333.4032-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/isom: make the parameter used for loging in ff_mp4_read_descr() a pointer to void 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: O9W4WYifiBAN Signed-off-by: James Almer --- libavformat/isom.c | 4 ++-- libavformat/isom.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 74bb13dc96..65d71ed9d0 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -292,12 +292,12 @@ int ff_mp4_read_descr_len(AVIOContext *pb) return len; } -int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag) +int ff_mp4_read_descr(void *logctx, AVIOContext *pb, int *tag) { int len; *tag = avio_r8(pb); len = ff_mp4_read_descr_len(pb); - av_log(fc, AV_LOG_TRACE, "MPEG-4 description: tag=0x%02x len=%d\n", *tag, len); + av_log(logctx, AV_LOG_TRACE, "MPEG-4 description: tag=0x%02x len=%d\n", *tag, len); return len; } diff --git a/libavformat/isom.h b/libavformat/isom.h index 5b6125a908..ceb3aa2f49 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -363,7 +363,7 @@ typedef struct MOVContext { } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); -int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag); +int ff_mp4_read_descr(void *logctx, AVIOContext *pb, int *tag); int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb); void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);