From patchwork Mon Mar 2 04:44:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17992 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 20E97449CCD for ; Mon, 2 Mar 2020 06:45:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0689768B082; Mon, 2 Mar 2020 06:45:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1428D68AA9A for ; Mon, 2 Mar 2020 06:44:57 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id z12so9553848wmi.4 for ; Sun, 01 Mar 2020 20:44:57 -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 :mime-version:content-transfer-encoding; bh=LDfQ6fGtkFALb9q8KvfZ5T7envKm+++T6KWOQK6kh20=; b=cP7kY1tdL7rXdw8MmbHCarQ5aiChkX/aMXlT71gjmaiMlc46m4hm3S23vLvPb3NH7w wq8LyZT/AOSMRRTKKaJpfT0iWGKLl834Wf3EQvr1iZf8OlXknqJ6VkMaegCxLgslIgW9 PZ5TvsJO24xsp7YiIcuF83ikfoMC5Sg51Evvy7YrSZM212ygF/bdv4NLQcawg3x9SsPr DWEfkNeP0UJ3xrTwidgRorBjic+7xmHZ2TktQCdib1jYZcrf7qQxl0eibx0tQRgVjt0S Y6n+ZgP4ft3x6EQtME7OStjrox6NdSj1vNi0MWIa2uNb3HtXXlKO2ioanLodz4UzGCcq Vqpw== 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:mime-version:content-transfer-encoding; bh=LDfQ6fGtkFALb9q8KvfZ5T7envKm+++T6KWOQK6kh20=; b=qpPVkX7Tc5zOh+Yj4PN2cUmDtZfYoKdLktcOuCKDH8d5gJeDl2Kinx+1WAKlXXjB19 2YC/gxlqEYTdf9s0Tiwf5B+6RA9lGKeeQjf2yeebN2QpbrAJnlNvBrSmZi5d37CSZYR/ 3VZ6R6dSPdPkPuWI3/rFk8/bhDVyDRho2fbzgmFRlBQM4hJBRg0h2Yzo8U+byrdtQ1rz 1OsrQYg/X/KMyxWWg+nFRAKA4w1AWgCZONXTuQ/BzxtWUAXYCHsXsXaAtkwwz1tAbD+u Jq13kcH/MLb3fOnGivoW602bT+SpwaNjZ6OzhdeyteD7Cpge1eMHD8hCnTKzKe2mNQ10 CIBg== X-Gm-Message-State: APjAAAUymWykmV4Itf8X2jtTIDcEucmK4hOukgEM56I0vMAPEm6RjIvh aKuL97hyT0M6uJGp7+f2P9RgftpP X-Google-Smtp-Source: APXvYqx0IUYLdVLHp7UCBASN++jQJyQWQteiy6zUtzqMXsRo0CFftDg5wEPKecCej6Z7bPZQTWgJHQ== X-Received: by 2002:a7b:c204:: with SMTP id x4mr17514069wmi.20.1583124296402; Sun, 01 Mar 2020 20:44:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s22sm13130229wmc.16.2020.03.01.20.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:44:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:44:33 +0100 Message-Id: <20200302044445.14842-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> References: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/17] avformat/webm_chunk: Don't use child AVFormatContext 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 --- libavformat/webm_chunk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index bc3d346a00..0d4e3598ed 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -87,25 +87,24 @@ static int chunk_mux_init(AVFormatContext *s) static int get_chunk_filename(AVFormatContext *s, int is_header, char filename[MAX_FILENAME_SIZE]) { WebMChunkContext *wc = s->priv_data; - AVFormatContext *oc = wc->avf; if (!filename) { return AVERROR(EINVAL); } if (is_header) { int len; if (!wc->header_filename) { - av_log(oc, AV_LOG_ERROR, "No header filename provided\n"); + av_log(s, AV_LOG_ERROR, "No header filename provided\n"); return AVERROR(EINVAL); } len = av_strlcpy(filename, wc->header_filename, MAX_FILENAME_SIZE); if (len >= MAX_FILENAME_SIZE) { - av_log(oc, AV_LOG_ERROR, "Header filename too long\n"); + av_log(s, AV_LOG_ERROR, "Header filename too long\n"); return AVERROR(EINVAL); } } else { if (av_get_frame_filename(filename, MAX_FILENAME_SIZE, s->url, wc->chunk_index - 1) < 0) { - av_log(oc, AV_LOG_ERROR, "Invalid chunk filename template '%s'\n", s->url); + av_log(s, AV_LOG_ERROR, "Invalid chunk filename template '%s'\n", s->url); return AVERROR(EINVAL); } }