From patchwork Wed Jan 4 16:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8942015pzb; Wed, 4 Jan 2023 08:45:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWQMyx9U4dmsNMTZl+tu3sAktrJQkcxED/qEylcE0SBgyBZX+qtDZapvGSiBqXdBpJKN2T X-Received: by 2002:aa7:d40b:0:b0:48d:778:e6d6 with SMTP id z11-20020aa7d40b000000b0048d0778e6d6mr11696121edq.19.1672850748959; Wed, 04 Jan 2023 08:45:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672850748; cv=none; d=google.com; s=arc-20160816; b=XC2Iel8m6qK6AROPD4ICpYmx9ACn6XiW8nhYMK6bPb1tqoSnHVMDsGeeIIwCQJ2cBw /EuejDubgvYPi197b7UWOfw3Q1DGJOOnmk5f6UGAcCazzG96DGVSm/8Jc3JablDL6OSr yL1jB9CeeWz1LnbAde3lloizvEz/xAyjVM0v3I4gaZkCl9Pa4a1eFskrpSAjRfy0bVoJ vtTPDSCdtk1F6uJBz3YEfSHcMAO/ZCX1k4kdgJHiU6a4YfwbsmzXS/ly+5uXYZOg20Eb +0trWamQRXH5QqwoEeG6Pbn3ry0PViB4VmWFOib6qRpLWIv+O9mEGYanNwC9ZeLOPCpW 0k3A== 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=5gb9KiPjMc1s1HfG2l9LhOI0zBZwHUd4g+lwVqZwevk=; b=MEjC5yoGDMRYmZDmOCs5VtsBL8QgxFZs2mcccKxcOQCjA69hNJnDOwynK+njnVQL/J OkrY9jdUXXyG2R44Ks/rYBkb15WSqE3GCrRxEMK5irB5GpDooYy/fRVUSM8KIIbAUhgw 8gy8qA4AhT3Zv95zg2gZTxBIra3YGzydL0Zjh96x0zB2zsqJbQ+dQwaNIqpc2vLw2oXX +9BhGIqYs08k7Mc3+/FVHolYrRjtlUqTVyH2uHWKQhflBc680+NePp75P8yDSR/dRzWc fFjQpI2048rWjepHK7IGAiK0eZkNXq9KuB/+vG1bD5SwaLBCZh63iVfzQvJGf3vbbfGh ytng== 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 ek8-20020a056402370800b00485d0d6ea57si21310822edb.619.2023.01.04.08.45.48; Wed, 04 Jan 2023 08:45:48 -0800 (PST) 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 56C5968BCE9; Wed, 4 Jan 2023 18:45:28 +0200 (EET) 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 978EA68B1AD for ; Wed, 4 Jan 2023 18:45:20 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5D41D2404F7 for ; Wed, 4 Jan 2023 17:45:20 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Hv3iPHKEhhmo for ; Wed, 4 Jan 2023 17:45:19 +0100 (CET) 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 923EC240591 for ; Wed, 4 Jan 2023 17:45:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 92C393A034A for ; Wed, 4 Jan 2023 17:45:10 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2023 17:42:41 +0100 Message-Id: <20230104164246.6133-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230104164246.6133-1-anton@khirnov.net> References: <20230104164246.6133-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] fftools/ffmpeg: fix stream id in an error message. 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: fIaxUTAslC4l Broken in 7ef7a22251b8 --- fftools/ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 2dbfeca020..00e4be68ea 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3797,7 +3797,8 @@ static int transcode(void) packets_written = atomic_load(&ost->packets_written); total_packets_written += packets_written; if (!packets_written && (abort_on_flags & ABORT_ON_FLAG_EMPTY_OUTPUT_STREAM)) { - av_log(NULL, AV_LOG_FATAL, "Empty output on stream %d.\n", i); + av_log(NULL, AV_LOG_FATAL, "Empty output on stream %d:%d.\n", + ost->file_index, ost->index); exit_program(1); } }