From patchwork Sat Jul 22 17:30:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 42906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp972188pzb; Sat, 22 Jul 2023 10:30:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlFI0xztB6UHXY0/tjDyZQP3pt9DCVZkGXC0YsRM89arTDUCPTmxLBgQ/oZwYX6YpXzOyLmT X-Received: by 2002:a17:907:75d5:b0:994:34a2:8724 with SMTP id jl21-20020a17090775d500b0099434a28724mr4890875ejc.52.1690047024515; Sat, 22 Jul 2023 10:30:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690047024; cv=none; d=google.com; s=arc-20160816; b=FUEwjST3yxxBN4wGDCoF6ewwU7u1ubTQdm2su4k3KV60YujsjDhHbB1kUfEQVCZQGV f9dNXF39evt9zHb/9urJIKbGS/Z/2BxHBp/yd70vsmjfdYvsFijdIu6uSsCj7TCXiI22 ytGSIEpfauM4ke+YWp/wzI93AsB3zT7svmaeqgBe8MV4lBY0m7Fi1vN6bP8XysYQnTnA C8UzB09v4TYkEBAT+qFaFok0mi1B/lnQtBq+ugo7caeAIkOmvmFKutyzvIsusnXfmkCM zf5+AJnK2aAf3g8ac8jwYquaeugS1NRKITE+AOSE7+mGAn1k3nEH/fuqcFhSTxH198nC 6vWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=cnuo8FS7+MLGbNFvZly3TEND0QnXbAxJPDSoMH7JB50=; fh=fMjmfVbdHm+M/+18QsbBd9XwekW2z8GZAuS0XfnYyyA=; b=FMeYWUd7hcXkD+lR22SKAb3z3zESqDRE5opdXQAfF8u32tAxiDiRt+N3GWpVXPnP7J SoUNQZxDjeMUGIe4Cs3aizFfx9wNMzKpF3nxYJ/D2g/5t+kK8LT7KWMPQ72GumT7oD5o 7VlkfftcjpKiEEy3Incvn6jw3IgFAiPFcBqkoKbBW9llFQCRmuh6cjCYjETuXXvuwmfX 1JNd/4S+cpZG7IP2tOFNrF5H0oX2/lNG+yG/8j7e5YHht12ASK+QDI/9J6Q9bv4TCq4A gJPQphSBzt1UlPD6k91w5A1kk0SHh1vER0o/Iv/RDkuOms0eEiSVtBmgXUU4RCf6QAlW umeA== 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 lg23-20020a170906f89700b009769ff4d234si3994639ejb.58.2023.07.22.10.30.23; Sat, 22 Jul 2023 10:30:24 -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 8C6B468C62A; Sat, 22 Jul 2023 20:30:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EDF668C562 for ; Sat, 22 Jul 2023 20:30:14 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E114AE8EEB; Sat, 22 Jul 2023 19:27:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rvXjR3pzvYwm; Sat, 22 Jul 2023 19:27:13 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 44FE7E8C4E; Sat, 22 Jul 2023 19:27:13 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jul 2023 19:30:06 +0200 Message-Id: <20230722173006.9153-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: fix misleading indentation warnings after ticks_per_frame deprecation 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C9YFLWVRlETq Signed-off-by: Marton Balint --- libavcodec/libaomenc.c | 3 ++- libavcodec/libvpxenc.c | 3 ++- libavcodec/msmpeg4enc.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 16747e7e92..f29cb0784a 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1299,7 +1299,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, duration = frame->duration; else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base); - else + else { FF_DISABLE_DEPRECATION_WARNINGS duration = #if FF_API_TICKS_PER_FRAME @@ -1307,6 +1307,7 @@ FF_DISABLE_DEPRECATION_WARNINGS #endif 1; FF_ENABLE_DEPRECATION_WARNINGS + } switch (frame->color_range) { case AVCOL_RANGE_MPEG: diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 549ac55aaa..7a545527a9 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1830,7 +1830,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, duration = frame->duration; else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base); - else + else { FF_DISABLE_DEPRECATION_WARNINGS duration = #if FF_API_TICKS_PER_FRAME @@ -1838,6 +1838,7 @@ FF_DISABLE_DEPRECATION_WARNINGS #endif 1; FF_ENABLE_DEPRECATION_WARNINGS + } res = vpx_codec_encode(&ctx->encoder, rawimg, timestamp, duration, flags, ctx->deadline); diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 9828901bea..a8ddb8d8e1 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -284,7 +284,7 @@ void ff_msmpeg4_encode_ext_header(MpegEncContext * s) if (s->avctx->framerate.num > 0 && s->avctx->framerate.den > 0) fps = s->avctx->framerate.num / s->avctx->framerate.den; - else + else { FF_DISABLE_DEPRECATION_WARNINGS fps = s->avctx->time_base.den / s->avctx->time_base.num #if FF_API_TICKS_PER_FRAME @@ -292,6 +292,7 @@ FF_DISABLE_DEPRECATION_WARNINGS #endif ; FF_ENABLE_DEPRECATION_WARNINGS + } put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29