From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3D9AB46506 for ; Mon, 19 Jun 2023 21:12:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E71ED68BFAC; Tue, 20 Jun 2023 00:12:07 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20226687FAE for ; Tue, 20 Jun 2023 00:12:01 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1aa34b210c9so1013192fac.0 for ; Mon, 19 Jun 2023 14:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687209119; x=1689801119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Hr6ErQn+3Xy7xALPwLL8NBkfhwKS1vaDKgX6CVI6WWo=; b=iaDZ3thpCWMofE1/HkkXIKe5SbVQBPqmlgPmDoqgdUQ0mYCE2UyhLTauUWsvFMgYVG v+zcjq6H4EuZe3kkhn50sgqxgfdqc9l1pAzG5HQBJtBWEJWAFh7H8OgWVlbq+sVeOLWM IBLrXNeqZpZ8Ei5XNFh4epz1UiF7kpljnDREbM/ppnCtVlxiBaYPyIPrc9R3bkVR9eyh wYSSNqwlRYXmLD3KpYbgQqJw7APb1EpS0UEYqJAYwKJZx5lFgceiRJnID2Xo92soF2+O OxNhTg1/TzjYhebiUaLnSjAiWkXvTsF73a7PlWv0Nh++XmGTUZ3wBBNmAEBxDMZ11VFc IPzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687209119; x=1689801119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hr6ErQn+3Xy7xALPwLL8NBkfhwKS1vaDKgX6CVI6WWo=; b=cJ8140wGCeipuaqQ/vFU8zTC30Cd3j/q+iUwFXhfWx0jgdfgLudhal3l84BITP/Kds 1FPBMhFyuhfxZxanSifDZ3cSY7RU9dMEgqlz7lN3y2VqsZ7PtHGDkCvhrR7+gmsnxHNH oRNRu12Ea/6fwUpT/saoM2Dl1o/afPhz3nIbicXOyR7cDKYpQ6NZVk/9HHfrCSp3DOmN iw/nSjqOiY2h1zIY1ly91GFulFaaylpe1QcBIzaIpEjHDXXHpNAwtxoyZTQ6qFxChwoW AA1j6WKZ3nS19wyR15+jHTdrw7dUo1DeKL88M2YMspv6SKbxL6MwHaodARL+Slv1Bpw4 icJQ== X-Gm-Message-State: AC+VfDzV/dZoDYHUZ/UnfhFO6b/kBdddRKNxavhl0K7CkX0FUWWIb3dW jRD4ZFZqmAc6fa0bztBYHBXwd8Z+Z2U= X-Google-Smtp-Source: ACHHUZ5RqpbLOPZCzF1CXgSfFRshosFkzc/co5zb3+8OyhzRH+HCDrJQUtEAt2i14KKTjMRNKmcfaQ== X-Received: by 2002:a05:6870:1609:b0:1a6:a28b:6e4 with SMTP id b9-20020a056870160900b001a6a28b06e4mr11694889oae.37.1687209119244; Mon, 19 Jun 2023 14:11:59 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p1-20020a4ab381000000b005586008cd5dsm370886ooo.6.2023.06.19.14.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 14:11:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 18:11:34 -0300 Message-ID: <20230619211134.20857-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230618234332.1370-1-jamrial@gmail.com> References: <20230618234332.1370-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/17 v2] avformat/evc: don't use an AVIOContext as log context 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/evc_parse.h | 6 ++++-- libavformat/evc.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index a1fbbc643d..6fc19d0868 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -89,7 +89,8 @@ static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size, void *lo unsigned char *p = (unsigned char *)bits; // forbidden_zero_bit if ((p[0] & 0x80) != 0) { - av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); + if (logctx) // Don't log without a context + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); return -1; } @@ -105,7 +106,8 @@ static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_si uint32_t nalu_len = 0; if (bits_size < EVC_NALU_LENGTH_PREFIX_SIZE) { - av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit length\n"); + if (logctx) // Don't log without a context + av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit length\n"); return 0; } diff --git a/libavformat/evc.c b/libavformat/evc.c index 421ff84cb7..caead88bba 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -361,7 +361,7 @@ int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, evcc_init(&evcc); while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { - nalu_size = evc_read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE, pb); + nalu_size = evc_read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE, NULL); if (nalu_size == 0) break; data += EVC_NALU_LENGTH_PREFIX_SIZE; @@ -369,7 +369,7 @@ int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, if (bytes_to_read < nalu_size) break; - nalu_type = evc_get_nalu_type(data, bytes_to_read, pb); + nalu_type = evc_get_nalu_type(data, bytes_to_read, NULL); if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { ret = AVERROR_INVALIDDATA; goto end; -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".