From patchwork Tue Jul 16 17:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp466787vqb; Tue, 16 Jul 2024 11:14:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXMJDBdQXSYSn/ClLgrg4E3uKyq7igOLxJn0t4ezPAEMAQJdPC+oClw0T7iipiAFIRFUdvQhYf6HoIqO8Hf7C3XZnSAAMC8VUR5sQ== X-Google-Smtp-Source: AGHT+IE4Wlm4TT2a647nQo8uy32YONAB0KJdzo0LMG07QuwQs7TzT7pKTnnIrAxpWKFrVi3ciwOA X-Received: by 2002:a05:6512:33c5:b0:52c:86d6:e8d7 with SMTP id 2adb3069b0e04-52edef10755mr2320472e87.13.1721153690327; Tue, 16 Jul 2024 11:14:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721153690; cv=none; d=google.com; s=arc-20160816; b=QqTXCnmFkXfocF7O73mSEfWD6yCNsah2bBiGTn221vjyeaX5pAFIr0syEPTIjJHT1W QmO6k+AwDG5jdUI32H6Rci55PhSspWbbCee37EZuRt26onpIi4WUwS8RTWyEQeQS6fH8 zePgrZ768KbzvZJAupL/a9+msnIVEDUdfazyeG/MmZeT9PbA9voJVzxWFMN9r5I86ho2 GgrrY4ne3tCB3pr6kx+7wqBM1PDGT9AX4526hCnGEM0FtgKsk9Sj/k1JMNV1P9bYo5wk Z79kNff7+O+vgpI8UKZkKwG2PeyeWC39JC4sa8ExBvv4a4RNoOm3GleNAt9NcC7RVkgK wJlw== 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:dkim-signature:delivered-to; bh=ITP38/Cn9oLzSIArTBxXuVIXtcMhL0gyttYfpkOPhzg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=U0h5WFFzojR3yIQCcXypBL36ooHGu0OM9mVlZGE2G2XTLJ37ZRo20Eiz7d6FzEN8PL 50qEuACsMsO5jcxQM8z+qwk6Xww3jIMAD8tbjmeDBq4XbfnqRYdZn8rnkgjYs7LGKlVZ F3Tnp2ZZNNNMVzr9iAN33yw2M2vnBIGWBP4bwC6tI17ktFbux7LR7S//efzUZHJRKSxV a70YsDEcCKo/6DwnKeHbjyLPVtGFV+Mks9o/Fu1gqE0zmNBBCntUEY4n6WSZ7y0hAPl9 OT1dPZkLtfNQPnJO/SmxOXIn7ExvcBcCPQdC2KCH1v5Sa4zFLdRDd8OAsMSsblchvZE0 swoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=J72nH7wW; 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 4fb4d7f45d1cf-59b26a8d765si4096565a12.342.2024.07.16.11.14.49; Tue, 16 Jul 2024 11:14:50 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=J72nH7wW; 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 05EC768D9FF; Tue, 16 Jul 2024 21:14:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09FE768D88A for ; Tue, 16 Jul 2024 21:13:59 +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=J72nH7wW; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id A1B7B4DF4 for ; Tue, 16 Jul 2024 19:24:20 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id TD1XvDrejZJE for ; Tue, 16 Jul 2024 19:24:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150659; bh=UGzXlw71G1hMzEVpT+qzDS0zYOBrG4Fb4a57r6iezNU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=J72nH7wWbbvia2l61gMKJtG0tlqdIspz6aAMvlMQfYsmRKPO5kz3E6WjyGh/GZqlW 0poK9a5nAYBeIrGukXhJ9fjxqQ2qUT/R4dZo9DYgsPrJvqQg/wESn/u2E8zy2h6ZKS aj8X7AVS0CDfSEzy52xMkOkFiB4H5G1UsJaXpGX9JwpzISRR9o7Mk/HgH9tfsVfm60 rZ/jMjfi+3P3MSMr1OIA7c1iaisIe4/Qcf7j3dxbKOMunEi4BD2Dr6p/4hTxHEeWVP aCFP81FcMjSfI0tcRVeHTNe/KO3xcxGd3YxZLopi9Cbf8lIfha6ic6iGtx/rScD5tW ms7G0X51hHADQ== 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 3ADDA4E25 for ; Tue, 16 Jul 2024 19:24:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BEEF03A3012 for ; Tue, 16 Jul 2024 19:16:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:49 +0200 Message-ID: <20240716171155.31838-34-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/39] lavc/decode: reindent after previous commit 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: Vu3vLU/eQeBe --- libavcodec/decode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index dd94280f0b..deaecf0c01 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -430,20 +430,20 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, got_frame = 0; - frame->pict_type = dc->initial_pict_type; - frame->flags |= dc->intra_only_flag; - consumed = codec->cb.decode(avctx, frame, &got_frame, pkt); + frame->pict_type = dc->initial_pict_type; + frame->flags |= dc->intra_only_flag; + consumed = codec->cb.decode(avctx, frame, &got_frame, pkt); - if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) - frame->pkt_dts = pkt->dts; - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { + if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) + frame->pkt_dts = pkt->dts; + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { #if FF_API_FRAME_PKT FF_DISABLE_DEPRECATION_WARNINGS - if(!avctx->has_b_frames) - frame->pkt_pos = pkt->pos; + if(!avctx->has_b_frames) + frame->pkt_pos = pkt->pos; FF_ENABLE_DEPRECATION_WARNINGS #endif - } + } emms_c(); if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) {