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 AB7DE40A45 for ; Sat, 25 Dec 2021 14:48:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B90B668B10A; Sat, 25 Dec 2021 16:48:18 +0200 (EET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D578A68B04A for ; Sat, 25 Dec 2021 16:48:11 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id c2so9924375pfc.1 for ; Sat, 25 Dec 2021 06:48:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FJCBSk96wmCuxZe1w0SAWygvOYi3u7ojXdcSCHmjEyE=; b=S2U/uEor5vGtr6ukBPqKpParVKl1Y1xawQ3sndV/PbiCUzVFRYYKPA645rlIPHDVS2 AHCRhHI+CRKfEEcNqTYVbJA9V2YMaLLotiuAzBtuijH5JDjjjWi/qfECnqyvJmKxpJDc MIYPKB2oc9TNSDq5TlHJmoIR+wreQGKsIWL4a+9W0fRygw6LUg4BMeC3fynV0LsWHH+B X3bD8klbWvGZczYdY9MLsovTHaMXm9dWGpxKFpesZE+iQwakUVMGrWEG57UY6vuU36zB xhLEXSiV3s9HpSadwtA/hQCoZupTJNPeSnQvRGNAcSmA5OsX3SsKKVPtR5y2ZggoHW5M /QlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FJCBSk96wmCuxZe1w0SAWygvOYi3u7ojXdcSCHmjEyE=; b=Flb597KtsAtNLaUz+TM+NoUwYJT4BbVSwDwndte1rPQbixXeT+pe9jXTydwKW7zyC+ zOqMKLFgC+84p1duBx7SMQ3eUxxY+vlt037N8sw7rlugJdTrC9osu1HOSx8WvEwrYUh0 Bs2WBAGabquXTDA53YtnKoMdyz3DF32AF6JcgfmTn82lnKEyu5Q3zAZaJxAWZxg6AGZ4 FinJ5NvTH7QJrH/stLNrcRnClQkqyMnV7e4iC8wim1bjkXx6708rNGJCKT1FsNfHr+tD n/hlcfHfaJE+VVR0SEBiX/xjPpqcVbyvc+AfNuHId/ew3Q7hK/ow9KjlnDoYgaQeYodL gXiA== X-Gm-Message-State: AOAM5323pCeoPLWHNqGcInNHoI4tBlXIipsBnqZdYLcCd/09apAqNn+U fEP7l6D6GK8cqK6upP5I3vfV+KYSGvI= X-Google-Smtp-Source: ABdhPJz28dWy/LiyAUKalXaaQdJ3WQEccN/qz7oiTmQ5eBtKPkIL59vRpziiz3dWftdqWDEzr4E1lg== X-Received: by 2002:a63:2bc1:: with SMTP id r184mr9468231pgr.426.1640443690191; Sat, 25 Dec 2021 06:48:10 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id on7sm12124919pjb.50.2021.12.25.06.48.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Dec 2021 06:48:09 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 22:46:53 +0800 Message-Id: <1640443613-26238-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1640443613-26238-1-git-send-email-lance.lmwang@gmail.com> References: <1640247094-9784-1-git-send-email-lance.lmwang@gmail.com> <1640443613-26238-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/libx26[45]: reindent after last 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 Cc: Limin Wang MIME-Version: 1.0 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: From: Limin Wang --- libavcodec/libx264.c | 44 ++++++++++++++++++++++---------------------- libavcodec/libx265.c | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 9836818..c5e0231 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -466,29 +466,29 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, } if (x4->udu_sei) { - for (int j = 0; j < frame->nb_side_data; j++) { - AVFrameSideData *side_data = frame->side_data[j]; - void *tmp; - x264_sei_payload_t *sei_payload; - if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) - continue; - tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload)); - if (!tmp) { - free_picture(ctx); - return AVERROR(ENOMEM); - } - sei->payloads = tmp; - sei->sei_free = av_free; - sei_payload = &sei->payloads[sei->num_payloads]; - sei_payload->payload = av_memdup(side_data->data, side_data->size); - if (!sei_payload->payload) { - free_picture(ctx); - return AVERROR(ENOMEM); + for (int j = 0; j < frame->nb_side_data; j++) { + AVFrameSideData *side_data = frame->side_data[j]; + void *tmp; + x264_sei_payload_t *sei_payload; + if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) + continue; + tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload)); + if (!tmp) { + free_picture(ctx); + return AVERROR(ENOMEM); + } + sei->payloads = tmp; + sei->sei_free = av_free; + sei_payload = &sei->payloads[sei->num_payloads]; + sei_payload->payload = av_memdup(side_data->data, side_data->size); + if (!sei_payload->payload) { + free_picture(ctx); + return AVERROR(ENOMEM); + } + sei_payload->payload_size = side_data->size; + sei_payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED; + sei->num_payloads++; } - sei_payload->payload_size = side_data->size; - sei_payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED; - sei->num_payloads++; - } } } diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 47d0103..851f099 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -545,31 +545,31 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } if (ctx->udu_sei) { - for (i = 0; i < pic->nb_side_data; i++) { - AVFrameSideData *side_data = pic->side_data[i]; - void *tmp; - x265_sei_payload *sei_payload; - - if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) - continue; - - tmp = av_fast_realloc(ctx->sei_data, - &ctx->sei_data_size, - (sei->numPayloads + 1) * sizeof(*sei_payload)); - if (!tmp) { - av_freep(&x265pic.userData); - av_freep(&x265pic.quantOffsets); - return AVERROR(ENOMEM); + for (i = 0; i < pic->nb_side_data; i++) { + AVFrameSideData *side_data = pic->side_data[i]; + void *tmp; + x265_sei_payload *sei_payload; + + if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) + continue; + + tmp = av_fast_realloc(ctx->sei_data, + &ctx->sei_data_size, + (sei->numPayloads + 1) * sizeof(*sei_payload)); + if (!tmp) { + av_freep(&x265pic.userData); + av_freep(&x265pic.quantOffsets); + return AVERROR(ENOMEM); + } + ctx->sei_data = tmp; + sei->payloads = ctx->sei_data; + sei_payload = &sei->payloads[sei->numPayloads]; + sei_payload->payload = side_data->data; + sei_payload->payloadSize = side_data->size; + /* Equal to libx265 USER_DATA_UNREGISTERED */ + sei_payload->payloadType = SEI_TYPE_USER_DATA_UNREGISTERED; + sei->numPayloads++; } - ctx->sei_data = tmp; - sei->payloads = ctx->sei_data; - sei_payload = &sei->payloads[sei->numPayloads]; - sei_payload->payload = side_data->data; - sei_payload->payloadSize = side_data->size; - /* Equal to libx265 USER_DATA_UNREGISTERED */ - sei_payload->payloadType = SEI_TYPE_USER_DATA_UNREGISTERED; - sei->numPayloads++; - } } } -- 1.8.3.1 _______________________________________________ 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".