From patchwork Thu Feb 18 03:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25735 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 DF46044BC26 for ; Thu, 18 Feb 2021 05:43:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C48DF68A0AE; Thu, 18 Feb 2021 05:43:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20038689995 for ; Thu, 18 Feb 2021 05:42:53 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id 7so1187491wrz.0 for ; Wed, 17 Feb 2021 19:42:53 -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=DMBTPoc0VqbVqiP3uqvaV6iZQKCLF+UHFKkQg9BQaxw=; b=WMBAGt1z/kTyC/IRNP1qC9xZgb3GgQqQoGPT6AZlIUDZmwBxajUn9RqsQFQTJHoQEU VT+nGW4D6Uf9L4zuRKl4AqV7wArt+XTKmcHUg1zAom/TRiC5NNTFLLuIJIkx5NOg6fvv 0sUF5TtXV6dIpLcRJvLa/lXXmtj2FOl6XX4Z/GnfFbh9KOqN6/lq8GkOTFGBsFzI90q0 LWymcY3btlAQzFrKePU7VDtMBknZc3s/1zouqyfnslgVtscsV1Qa2lUE7IANLMQvSaQL 3AAE5dr/9qhhrt82PiaJlTFFNsT3Rfib4UorEYyguJAGjuU2nOshYGuUKjkjf77Rb/hj 3JPQ== 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=DMBTPoc0VqbVqiP3uqvaV6iZQKCLF+UHFKkQg9BQaxw=; b=amMb42c+m/YyB0EFMkY6wk28MPtBs5bmNfRkZqFvXhcaUFzguHyYo7DXnHnvbpbHM6 XKgnpEzGDtxsFLwRhPU0WW0ZYS8EpukSfxGueyyCd1Jv6tPinWZcu1P1rXbXnYbZStbe Y+as6rk1dvpUr3fUt9T/29DYKo5gbsrGU42J6r1eu6neetMrBScPQ3YUMTdvaEw6Y/Ti +GHz7IhxDwvJXxd4jLqkud1bjjiWu3adOzjNeCdHUXWLeA2vCg3+2pilQIGbBVUVif0c aZkAqN0zDaVQHHUtuUsqQ685fqL6t+Gf2B3rYDVQy8iCRw6vw2hUzY2sDZCWOCOVjmgp entw== X-Gm-Message-State: AOAM531Ki7l54T7OVLZqiQUfu8B6rhx4GQozK3ZUAPMsaLTgmQhNOkIB DG5rlkypPmAnODUeV5OOESARoyoF6aI= X-Google-Smtp-Source: ABdhPJyYk4EL89eOk+edlkdwctnLlB3rFqiajuyNmeFqjUAjruev/W/AHTsRC3cnffqw7h8G/OrAEw== X-Received: by 2002:adf:df8e:: with SMTP id z14mr2221537wrl.108.1613619772523; Wed, 17 Feb 2021 19:42:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id p9sm5643855wmc.1.2021.02.17.19.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:41:57 +0100 Message-Id: <20210218034214.2090223-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/29] avcodec/mpeg4audio: Use proper logcontext for logging 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 --- libavcodec/mpeg4audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 77cf2fb61c..2286303b54 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -30,7 +30,7 @@ * @param[in] c MPEG4AudioConfig structure to fill * @return on success 0 is returned, otherwise a value < 0 */ -static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) +static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c, void *logctx) { if (get_bits_left(gb) < 112) return AVERROR_INVALIDDATA; @@ -43,7 +43,7 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) c->sample_rate = get_bits_long(gb, 32); if (c->sample_rate <= 0) { - av_log(NULL, AV_LOG_ERROR, "Invalid sample rate %d\n", c->sample_rate); + av_log(logctx, AV_LOG_ERROR, "Invalid sample rate %d\n", c->sample_rate); return AVERROR_INVALIDDATA; } @@ -136,7 +136,7 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, specific_config_bitindex = get_bits_count(gb); - ret = parse_config_ALS(gb, c); + ret = parse_config_ALS(gb, c, logctx); if (ret < 0) return ret; }