From patchwork Thu Apr 27 08:37:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 41344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp336413pzb; Thu, 27 Apr 2023 01:38:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+++oh8eYD01cevUd51eOww/eE7F1uatJkgXBqDx2NEhXcY4hyiBnCUQ2IS/OIopH+iyCC X-Received: by 2002:a17:907:97c3:b0:957:17c5:8705 with SMTP id js3-20020a17090797c300b0095717c58705mr1121977ejc.51.1682584697733; Thu, 27 Apr 2023 01:38:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682584697; cv=none; d=google.com; s=arc-20160816; b=WOLwm23IkNHf+6vL9TgeGdK8WlKhs25ybRi9fwhAfN9GmTJGKEJkuZXL/IWwzAZl+7 o2I+m3Aww9N44l0F4gXVd1D6ZVqSIWM5SJcm1YxWHoxSOyCgDt5wcbRSDUUVbDRfPPpy I50oze49L0xgF+stSLVlo5lSboYM/zFajltZLPXpJrofRrsuCVv+UTnq2+CM1ROBNszQ OMqwj3Bqsx0l+6Qtq9XjI4fu3RQQxmEp8st9S4lpievpdhDcxc1yqexQW7v1OMn3ey+m hdH6DH6JRen2zd7VHrg8d+lIGRMrcrJH3+i+oWEr7FiC4OiXn4E4H87shzwwvaBUmVD0 ucfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=pUsg+KhcSHWUCx686aGL/OhQ6jTjZBvYb60tSLyP7SA=; b=mWIi+6+YZKvHS4qBmQJlb67IC+Dy3UPTGz8JbZsIXMt6jNGVG0QPPJU9bexmiXqkA8 CWyIVyoT/px4DI4VPI8HXNMLr63+FqbeQ0rF0Zs2lYeWK5xr2yYmD5zUQU3UkEkd3eSp mTQFD+VlWpr4TgxNmjFiVcy7Uy1T5AkZmmeifmb+hlF8/KmaE9TOxCDbDx/WtSTxuuUr Y8WsGiutbxLU1++41/E4s0rhXZqSwZ5vtDLkSq1RY4C7CCS5uel4NtyNh5xO8HhXB3t0 QCazt1LL4ioj+2Szgt1D5Diheu2Fhmr3aKHwL594asxr2XavnngpLrcl/U4fagOBJfYD +3Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="K/2cpaCy"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id pw22-20020a17090720b600b0094f33903203si12971841ejb.254.2023.04.27.01.38.17; Thu, 27 Apr 2023 01:38:17 -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=20221208 header.b="K/2cpaCy"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 487ED68BF38; Thu, 27 Apr 2023 11:38:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f176.google.com (mail-vk1-f176.google.com [209.85.221.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FB8968BEDD for ; Thu, 27 Apr 2023 11:38:06 +0300 (EEST) Received: by mail-vk1-f176.google.com with SMTP id 71dfb90a1353d-440887e09c8so3243721e0c.3 for ; Thu, 27 Apr 2023 01:38:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682584684; x=1685176684; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=MNb2cWVFdj81muCQhE/BA0aWdJrTxJ2ztWF1yXiYM58=; b=K/2cpaCy3E6uZ7TaFLada+Efehh9U9hheDyqrq4XB8LAFaZx3ZjGtz8woiIA/KO31M 7fDRL1ovuEi+Upa5ulQtq3V5w4tlH0RudNBEdGbeMG1Lp6HvYiebGJPlpJnNcTt62Gwp JHTbUBsakdU3RVuaSvVPEKVgqnPoa9fwztImazkWKqwTmFQ4gvyTCOzRlMaSYKz6Trfs /l+Mh6Er/iUu2ejBqWvjyD81KMfqd4wNMswQmvijWBqmqChYkFo1ZD5NKlU1eqAeEy0T DMk7CVMcVjEXk2khps09DsCLT8mbo/SZtWts43wYYfSm7VRoHNcgY+9OTBigRZtvYtCt 47dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682584684; x=1685176684; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=MNb2cWVFdj81muCQhE/BA0aWdJrTxJ2ztWF1yXiYM58=; b=J1v4x+oGXhmwvz8IkbSIt4wewtJOeFXpPSTzqy0bWrSol7D+jTdz/vF/UFT+qjtw79 WfjAWXVC/8x0Kqlkt1Yhlw/CcQW2kSV6lv05up+pQzZZL9V5W/W4Mo0s7MZP2bZQwger j/WcZIPEK6wk5MLjg+CS2XpV6kD8SFOd79T6rPj5w/aYHWx0OuML4ywWRtp+5TuUSgJh dOAZjZW0iIfLJL1ctLMZesHRJARBbTFF9lvEYV8O8YKuqeJ+PdWvvMwJilasy1AmFxF5 ODUZoFa1rKoJtJSdb1M3oAaLg1bpoEDSJuwLEoEpWq9T6Ap3cqvnyeh5QTlbOr8vBLUC q2Dw== X-Gm-Message-State: AC+VfDxOoabFCfyYBJmj8cYhbS7lScXXmrnUGRBZfUkhW8d4IULpPWym dEOBP9Kn769ntF6Qs/5lptdtF+y2znABXCLsZ9EDTu9A X-Received: by 2002:a1f:bdcd:0:b0:43b:eed3:a7c9 with SMTP id n196-20020a1fbdcd000000b0043beed3a7c9mr180370vkf.4.1682584684524; Thu, 27 Apr 2023 01:38:04 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 27 Apr 2023 10:37:45 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avformat/adtsenc: do not pass NULL to av_log() 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: bZ5uK0yTaZMH Patch attached. From 4d990d87cc4df0593abeec8e398556089f1a7c0c Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 27 Apr 2023 10:35:33 +0200 Subject: [PATCH] avformat/adtsenc: do not pass NULL to av_log() Signed-off-by: Paul B Mahol --- libavformat/adtsenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index b5e9640544..c5765cc92e 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -127,14 +127,14 @@ static int adts_write_header(AVFormatContext *s) return 0; } -static int adts_write_frame_header(ADTSContext *ctx, +static int adts_write_frame_header(AVFormatContext *s, ADTSContext *ctx, uint8_t *buf, int size, int pce_size) { PutBitContext pb; unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size; if (full_frame_size > ADTS_MAX_FRAME_BYTES) { - av_log(NULL, AV_LOG_ERROR, "ADTS frame size too large: %u (max %d)\n", + av_log(s, AV_LOG_ERROR, "frame size too large: %u (max %d)\n", full_frame_size, ADTS_MAX_FRAME_BYTES); return AVERROR_INVALIDDATA; } @@ -192,7 +192,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) } } if (adts->write_adts) { - int err = adts_write_frame_header(adts, buf, pkt->size, + int err = adts_write_frame_header(s, adts, buf, pkt->size, adts->pce_size); if (err < 0) return err; -- 2.39.1