From patchwork Tue Mar 16 20:31:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26420 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CFA2F4487CA for ; Tue, 16 Mar 2021 22:31:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B48FC68B04C; Tue, 16 Mar 2021 22:31:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65BB668B021 for ; Tue, 16 Mar 2021 22:31:32 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id mm21so74300339ejb.12 for ; Tue, 16 Mar 2021 13:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=TP7ELip2zL7UOVix7E5HodB5KAbue8+24+asyP8+/gs=; b=uK5mHuOGBGgEAsJ5wxZAqEzUzBMHjR2qm35NT2hsRkP3Nbt/HPlMntv/vHKZSx1XRK EW4wJLWpOb99FtYgSa0Iqo2ppPI1r0lQFaZzmyODXMGe52h/xsQrLWd62VbUpwYNyJUB KFpNIbYMJJ+PFATEm8LSErZcR9oGWiH63EJPAiHsIASOsU8qWQ2KUrA21qAQkmn0X0j+ HEgxe3+ZdVs4eGGSIcUJ7efrzKzthqnykWVZH/deqkfWvHcf8/7HXmlyjoKFOEG/3p2c 8Nj8Bv3PhO3ltqD03nVZoupELwxHJCz0KKQUPDa5oeZeeA+BiKabS88KN5A9wU0/S3Gf ZqZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=TP7ELip2zL7UOVix7E5HodB5KAbue8+24+asyP8+/gs=; b=KIOzFBv9Y7nlgJr/Y/IoXNQq7FGf3FfWJKPvphxeDY+l9Q6Cq0py7L4w5V0uRL0g5i OhJG+2ZTmni1ZrNq0ngBxKBetpIbQoHtUB5dYNGsRBWM1C39xsc9oM+Ulu8WSJKItEHF zpieQ8f2E4zVi2R+NhsC3MWEAr4T0+CJ4DknzmxcPP/tWbkqYLWQQyyMQPgi9sOrjHrn 3QPhGcgansgk5F86ZpEbHF98fCcjixS8axsJfZG9ck5oIUWMJxXyCXWQPcBX1ESkzpBK dAdTOU4QznWfSoOk+TlxWxpPHBxPgSueS9/PrdhN1BscThM6vyQmA/hMzx7FyXE2ISZ9 VWrg== X-Gm-Message-State: AOAM5306c+siAyWIG/GyVb2HwR6mrvpcT9LjmDIYkkioVGVyPhq7dUiC vUjOTqWK1wqfFK6GFCH12Fxy780+mRzrsQ== X-Google-Smtp-Source: ABdhPJzVEHaXULDAKiOG+fW3DWdcJ/eJkWIF2Y5Olqnq+VndDrw0I+K9oXgwBd314NfKikDBzyEs1A== X-Received: by 2002:a17:906:8443:: with SMTP id e3mr31091255ejy.370.1615926691602; Tue, 16 Mar 2021 13:31:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id a22sm10281908ejr.89.2021.03.16.13.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 13:31:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Mar 2021 21:31:00 +0100 Message-Id: <20210316203100.528950-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210316203100.528950-1-andreas.rheinhardt@gmail.com> References: <20210316203100.528950-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/options: Reindent after previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/options.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 53f13dab37..58c7ce8d62 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -140,10 +140,9 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) s->reordered_opaque = AV_NOPTS_VALUE; if(codec && codec->priv_data_size){ - s->priv_data= av_mallocz(codec->priv_data_size); - if (!s->priv_data) { - return AVERROR(ENOMEM); - } + s->priv_data = av_mallocz(codec->priv_data_size); + if (!s->priv_data) + return AVERROR(ENOMEM); if(codec->priv_class){ *(const AVClass**)s->priv_data = codec->priv_class; av_opt_set_defaults(s->priv_data);