From patchwork Mon May 8 09:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2180903pzb; Mon, 8 May 2023 02:19:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7q9IBOTctcmqOHNZQO3JJNew4z5oHQ6HEmFnLmAbq+/s2SdxL+HR8XfuhwAWFM63r+EiDc X-Received: by 2002:a17:906:d552:b0:953:4481:3301 with SMTP id cr18-20020a170906d55200b0095344813301mr8280965ejc.59.1683537580753; Mon, 08 May 2023 02:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683537580; cv=none; d=google.com; s=arc-20160816; b=leP5cpmHfLphbk07SpQhGPOt7YGE+rAaIzvos8nBs7u55PNEEtaGyUOKECzaUvGYa5 vZ3emAsFvkU/XpM9MFK5FgXR00eABJFwKGxG9JLL/Avxxw4WLBC+jv9xRGDeDHCF0paz WT36pp8wc8ugpdYWoF/mFu4mYFA1k/0dgCTmAnxHgJpmcvezhqAs0ENacekrqWNZt7qY UN/JkTBIS5cUmj5pYIEBaeFIYT8v6BvtRrbft5JWvSSYmPN43Q9PPF/zVFBfk4S7BOke p0IBmzOVgDhYlXijxGRcY55sOGn7uTLc+vWX3DcT0ZD4ISC3lr2Qv6Tij9vT2lK7Z7QK eLCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=/RjTDYxH2JoQP7RkQxFCk/qOApCVO3L3o5isFnWsxx8=; b=UaZOR97AZkTxrIoKjNdKHCPhy1zr+FTtbFOLke/iQj8AWzJipFBqr3PbOIDTnZyLV7 9MS2aTOk6lyqWc1QHzPp3lnheeInKqxrMkjoOYt4c4qqvdvLnnRJpaWLb35GgbZdI/B6 bhVRBbQK+zYUCIaPbyQDSSB98zeQ/dW15OGVWg1wifGrVMxP8nf0aQv6ZGas6zDCB7qE VLps+YLXY6JejqSI9OooiMe0nrluEVYjw5tiKbCPFaQZxmEfOlvsNhAzjm9gVDgDn6a8 7nKzKo7j2aGeFVFkrIqi1SOu3B837WKYZ4u/nX3eDZspXlwH2Bc3Tk+elo4K8tDRk7ad 7VzQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h3-20020a170906718300b0095723b2b32csi4913622ejk.182.2023.05.08.02.19.40; Mon, 08 May 2023 02:19:40 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F39FE68C1A7; Mon, 8 May 2023 12:18:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E776868C140 for ; Mon, 8 May 2023 12:18:05 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 86F9A2406CF for ; Mon, 8 May 2023 11:18:04 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id qL_QxBlGrUgK for ; Mon, 8 May 2023 11:18:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 9E21B240706 for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8FC1F3A048F for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 May 2023 11:17:34 +0200 Message-Id: <20230508091738.20813-18-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508091738.20813-1-anton@khirnov.net> References: <20230508091738.20813-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/22] fftools/ffmpeg: log corrupt-frame errors to the appropriate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XvbtLAJAqDGS --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 981714d027..092c5e179a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -779,8 +779,8 @@ static void check_decode_result(InputStream *ist, int *got_output, int ret) if (*got_output && ist) { if (ist->decoded_frame->decode_error_flags || (ist->decoded_frame->flags & AV_FRAME_FLAG_CORRUPT)) { - av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, - "%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->url, ist->st->index); + av_log(ist, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + "corrupt decoded frame\n"); if (exit_on_error) exit_program(1); }