From patchwork Thu Dec 8 14:07:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp342008pzb; Thu, 8 Dec 2022 06:07:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5nl2EZwi5SLScRku6QPLND95/9wFwhfpBPWomjGDpcmr83ssKRq9UdXISPwgu5yk4uipkO X-Received: by 2002:a05:6402:501e:b0:462:ad1b:dd0a with SMTP id p30-20020a056402501e00b00462ad1bdd0amr2484444eda.14.1670508467159; Thu, 08 Dec 2022 06:07:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670508467; cv=none; d=google.com; s=arc-20160816; b=1Gi/UkMXbkXvs+xm2/smjwwMtE/IfbZbb1JnG71HkGGYlLH7IhgJWFekNStl7jv07p Tdagkf+nLFpQ9cZXZAtpYJzVIoRIsAsLmrqbbhtcixmi4HH04vwd5FwoTIlf01Ldo+3u 7wja8G94hmSWqYcgRwQNW5FG5DzEi2UpPrVwvET1lqrTr6LWb/7hxlbvlG3nzraAUJkN LPPfuvlbnT6N2BltDCAbMrub36QROdWJ0LFKj1nO6j04JbbZU0zvDpT7UGinK6ciNU4f twrPSJ16k7Gv8wUCUe+2mP3ctJzzuzrqXDBBLa/lBy9/NsK7/qm5E9+3qbixb//DXynH TTbw== 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=vBT3LDYEeWJ9Mm9/8gIRqUYRsuoO9DPLKoNj8ZBIJzc=; b=R9D5pDLd3xK+BfnLVxQT5Uq7NbpSr3JwkiUd9bAtYNzHD37BVkFmQX5MQxs5OUV9As HZMPxzyIk2RrjWyfQXhmbBWkMEyFzSAhhBoxdLqtubsniUZnCDSEiQN9G0FMu7MfLZYJ g6z0dQr7TQbcL9iiiUz/jRxsN0ZpSsJSqVIfPkAQ2VmzskdnDAGj/u3YhG0JMWbYMaG1 s2TyOYMeKAZzz5fxuwjhs90Zpc7f7xlsLtjrA2CRpvMOCEe/zhFQrvAT+0e47hUaAjAe N62Fj1pqhxRbGoS6BigjJ2cKL0uXXUdaJyUhz2S5showGV362w8V/+J9ipjXzg8wkJiN w/RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SFqGnyOd; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z13-20020a05640240cd00b00461c0fd2597si6514482edb.89.2022.12.08.06.07.46; Thu, 08 Dec 2022 06:07:47 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SFqGnyOd; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9212C68BA53; Thu, 8 Dec 2022 16:07:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E4CF68A37E for ; Thu, 8 Dec 2022 16:07:24 +0200 (EET) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1445ca00781so1950081fac.1 for ; Thu, 08 Dec 2022 06:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LR82CZcVP9/7fSQ3HPj3LwfuPBB6TMnt22geparBmM4=; b=SFqGnyOdyQoy5GwBvFsMx4zZuEjIbu5hJEnbN1ZpIKvu2593UXP+IT5CqlPIIWEAB3 wF/4McC5HuAtayBrQotuP5T733tL7snlBgZz0mGfDHwFXanK4WCFIh/ZwGMexbd7juoe IgqgVkthVIkO9rGUqJQj965JaYvzRaaPdakGKmJxDKHTXGDSdCb1IfLCwK6AmcpdvR4g nuLXp8v74w/g7FnSg3GYjHNLtOQv8dKC73/jZ7dm8Fdu+IHv2dSCj77MGmhjo78HvtWL Q6mVzySzKwqNcqICigQjkQ9vdYIT0FjKRYuqtj6Bzd72axoYFL2NyjXvWgaMqPd4nViK fOBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LR82CZcVP9/7fSQ3HPj3LwfuPBB6TMnt22geparBmM4=; b=KrcCdatKapCXGOgNCcLOqXS/z3ytzMcCM1FIKpHyP3DFsLV72X149bszyQsXnd3bo/ KjS7eBoSnQr6EyR8C2hFHVQviTFiAMZAp1D6wihDGL6/0GIEowQuwc9g7M8RmdgSzJxY RtFuFLw7ABq++GcLHhNSrcpnTduvxl8iDg9dUyu/g632E18zVqnb8wf0UJwlZQ/txJJi FB7wOuIHrwpR68D7woq2dm6jZuIKXAB+x8Q/Lsb5cw8LwFRHBGCd4m/lJZed/1sDsyMA VTL1PpHMZE1ju5VO8q0WrAGnfuMYIKO+LONapXgTC/UZS/n+ziii6GhZ7wsRxNnJA+Gc yAvg== X-Gm-Message-State: ANoB5pm0kMs9f8qmcvhcx/V+7u+I7zobgVwyyuHgJH18gte9z2VBKzZj OOe3ZdVngbfos7PRaD0IUY9nDeOi2gk= X-Received: by 2002:a05:6870:3c13:b0:143:7db5:84e with SMTP id gk19-20020a0568703c1300b001437db5084emr1034983oab.38.1670508442832; Thu, 08 Dec 2022 06:07:22 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e29-20020a544f1d000000b0035aa617156bsm10672553oiy.17.2022.12.08.06.07.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 06:07:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2022 11:07:03 -0300 Message-Id: <20221208140706.3086-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208140706.3086-1-jamrial@gmail.com> References: <20221208140706.3086-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/decode: reindent after the 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: 30I18iPd2kAS Signed-off-by: James Almer --- libavcodec/decode.c | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8f7f0fadbe..3e5be501b9 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1280,31 +1280,31 @@ int ff_decode_frame_props_from_pkt(AVFrame *frame, const AVPacket *pkt) { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, }; - frame->pts = pkt->pts; - frame->pkt_pos = pkt->pos; - frame->duration = pkt->duration; - frame->pkt_size = pkt->size; - - for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { - size_t size; - uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); - if (packet_sd) { - AVFrameSideData *frame_sd = av_frame_new_side_data(frame, - sd[i].frame, - size); - if (!frame_sd) - return AVERROR(ENOMEM); - - memcpy(frame_sd->data, packet_sd, size); - } + frame->pts = pkt->pts; + frame->pkt_pos = pkt->pos; + frame->duration = pkt->duration; + frame->pkt_size = pkt->size; + + for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { + size_t size; + uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); + if (packet_sd) { + AVFrameSideData *frame_sd = av_frame_new_side_data(frame, + sd[i].frame, + size); + if (!frame_sd) + return AVERROR(ENOMEM); + + memcpy(frame_sd->data, packet_sd, size); } - add_metadata_from_side_data(pkt, frame); + } + add_metadata_from_side_data(pkt, frame); - if (pkt->flags & AV_PKT_FLAG_DISCARD) { - frame->flags |= AV_FRAME_FLAG_DISCARD; - } else { - frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); - } + if (pkt->flags & AV_PKT_FLAG_DISCARD) { + frame->flags |= AV_FRAME_FLAG_DISCARD; + } else { + frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); + } return 0; }