From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BE76A48517 for ; Fri, 5 Apr 2024 16:14:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECB9668D23D; Fri, 5 Apr 2024 19:13:19 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EBE968D16C for ; Fri, 5 Apr 2024 19:13:10 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=AF3U/3AW; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 5BAD54D99 for ; Fri, 5 Apr 2024 18:13:05 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Pqjl7kQ0Mprh for ; Fri, 5 Apr 2024 18:13:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333582; bh=Rmpult1ygaWVFUP6R21T1hgIAjJV1mp1GmA3h2Xr+dA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AF3U/3AWfspPitSMmthzmP53Vn68kmt4MLjKbeuEEhGygrfV1PNBcudngtgWAbkFN 7kHIK+RyRucuGhw8N4Y94iKCRTWaBPRyWGglBmw2bnSvDT9NZf/z+M1QjzgnUBHvQk zoEWYvYrLz0G9KN98b7rLbveoFaYEWfslFLMPC7jy+EqVg0K6nOFdaFseKEOnQ4eBZ gqpF23UeY1Gp5l/pfQVc7p5IKKG5nJ4Fiv/R7UEpNfrWnpIXs1yyzMEiea1u3CxwMA EkMvtwTTC8sZ4jwRp8dloKO7T5LILA9x/qzSNKJeLcdpR2S/qSsSpReNIdFVjbXMPf 0IGzfafj9DemQ== 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 mail1.khirnov.net (Postfix) with ESMTPS id 2FC354D78 for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C4D653A0DA0 for ; Fri, 5 Apr 2024 18:12:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:11:49 +0200 Message-ID: <20240405161212.26167-8-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/31] fftools/ffmpeg: warn about ignored -enc_time_base for subtitles earlier 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Can do it as soon as that option is parsed, no need to postpone it until opening the encoder. --- fftools/ffmpeg_enc.c | 3 --- fftools/ffmpeg_mux_init.c | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index d1d1526830..618ba193ff 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -280,9 +280,6 @@ int enc_open(void *opaque, const AVFrame *frame) break; } case AVMEDIA_TYPE_SUBTITLE: - if (ost->enc_timebase.num) - av_log(ost, AV_LOG_WARNING, - "-enc_time_base not supported for subtitles, ignoring\n"); enc_ctx->time_base = AV_TIME_BASE_Q; if (!enc_ctx->width) { diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index d79ae1f491..8b03d3b108 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1233,8 +1233,12 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, } MATCH_PER_STREAM_OPT(enc_time_bases, str, enc_time_base, oc, st); - if (enc_time_base) { + if (enc_time_base && type == AVMEDIA_TYPE_SUBTITLE) + av_log(ost, AV_LOG_WARNING, + "-enc_time_base not supported for subtitles, ignoring\n"); + else if (enc_time_base) { AVRational q; + if (!strcmp(enc_time_base, "demux")) { q = (AVRational){ ENC_TIME_BASE_DEMUX, 0 }; } else if (!strcmp(enc_time_base, "filter")) { -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".