From patchwork Mon Dec 13 15:20:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 32437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5576133iog; Mon, 13 Dec 2021 07:25:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2bU3I/KKXPTbXB/Srz9VQhOVvuCHb44bq5wJChAv3JMGJHlR09x0rEZ7l+/4yCZQ98oOz X-Received: by 2002:a05:6402:42d5:: with SMTP id i21mr65691548edc.373.1639409128316; Mon, 13 Dec 2021 07:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639409128; cv=none; d=google.com; s=arc-20160816; b=TEHylOfsCvpyDKWk7936frbnxUtrNN1HtS+hE6rfynb8oaIaRjdSDlds/CR38gRkny jJ3+Y37Im7bb15YdtwIRFdxn8AUUX1qAP2U3Sof3hodaVwXHG5WeUtmnQplLdQla/KYV 386lKp+GMUJi2WPQcuO82pvKacZ4Ex4kBe2aJLuM68qu44h46H44YxPddPhE3fpEGXEv Y6zEhL7G5gF3PRnTr6LtelXXSaXizADC35CHxBFrvdSLHZu9ZATLR4uGLhdkjKs80U3B WxGWK56wqTLuQ75tZ41Z/1XovtehOCQTWOGYU17zb9BTx835DS0ii6KwyEtiYcdn/DHh prfg== 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=RgVjTnRCQ8ge/HYVFIY6rEfALepWyiVS5o11BjITru4=; b=KOjnSVXyncLtSEoFWr0AeJum3fd5rJH/6dSwF6TPmRKPvhMAdw4M6as2xYIlj33ijG p4kBwBVsHQb0SxWoaKX4pKepDi+qcYxsYYPQXJMVMAL16AV1vKIDd1l1AKEccT7y9N9H Pd74f7QsO+W1xZnLFKMM/Xj3ippxgCNPVZicr3hN0hswPsjvEM++RlX0BjoJTDn2yc4S q7fUZrRwXJTXrMd2XLDbUh1uDAtQG4caLi4x0Ooe1MtdrrW/FVot3fgOvhLxRc3k9bvQ S0SdNUadOy5EVjO6/0pfbl6/N14w0acJEMyNtllDVNzLUmtNZLYRoHuGkcG+in7nM1M3 mGug== 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 ce16si14409874ejb.5.2021.12.13.07.25.27; Mon, 13 Dec 2021 07:25:28 -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 5ED2A68B01B; Mon, 13 Dec 2021 17:22:32 +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 9CB9668AFBC for ; Mon, 13 Dec 2021 17:22:14 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BB238240555 for ; Mon, 13 Dec 2021 16:22:11 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id iQhYCCA30vrN for ; Mon, 13 Dec 2021 16:22:11 +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 A322524052D for ; Mon, 13 Dec 2021 16:22:07 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 393A03A0A2B; Mon, 13 Dec 2021 16:22:07 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 16:20:30 +0100 Message-Id: <20211213152042.5900-12-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211213152042.5900-1-anton@khirnov.net> References: <20211213152042.5900-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/24] ffmpeg: write the header for stream-less outputs when initializing the muxer 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: cKx+6QJAIPxP There is no reason to delay this. --- fftools/ffmpeg.c | 11 ----------- fftools/ffmpeg_mux.c | 7 +++++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index f76e5df8d2..c01ff2fa92 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3317,7 +3317,6 @@ static void report_new_stream(int input_index, AVPacket *pkt) static int transcode_init(void) { int ret = 0, i, j, k; - AVFormatContext *oc; OutputStream *ost; InputStream *ist; char error[1024] = {0}; @@ -3391,16 +3390,6 @@ static int transcode_init(void) } } - /* write headers for files with no streams */ - for (i = 0; i < nb_output_files; i++) { - oc = output_files[i]->ctx; - if (output_files[i]->format->flags & AVFMT_NOSTREAMS && oc->nb_streams == 0) { - ret = of_check_init(output_files[i]); - if (ret < 0) - goto dump_format; - } - } - dump_format: /* dump the stream mapping */ av_log(NULL, AV_LOG_INFO, "Stream mapping:\n"); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index e6417cdb8c..dcba02b8a3 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -354,6 +354,13 @@ int of_muxer_init(OutputFile *of, uint64_t limit_filesize) if (strcmp(of->format->name, "rtp")) want_sdp = 0; + /* write the header for files with no streams */ + if (of->format->flags & AVFMT_NOSTREAMS && of->ctx->nb_streams == 0) { + int ret = of_check_init(of); + if (ret < 0) + return ret; + } + return 0; }