From patchwork Tue Mar 16 20:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26419 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 8DE684487CA for ; Tue, 16 Mar 2021 22:31:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77F3C68B046; Tue, 16 Mar 2021 22:31:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 598B468B027 for ; Tue, 16 Mar 2021 22:31:31 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id e7so23117931edu.10 for ; Tue, 16 Mar 2021 13:31:31 -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=V2O8mJndySAqvWrcVscrHLamm5crmc8BHIFbuFF/RkI=; b=MgfovKndDyvvejeg6pOOlCTLcuAl8y33RD71I9JqYRFGJfgOr+wSyHqCwP7LZPWLET 7u/TnlvOSmfLsFLJmiA4aPHdTMswUSn/7kiBqUD4LiBSnUvXqX8YUQNT0ek312c/JOzQ dHcYlRsNOYz/l34ITCIiOgbJ+CZTnj9ys6rszycv9EZ2RJUgjYKHsqme2TgeQSGLybO0 +XEZc0/hvu5NrSRp9BtiZxLCMLGxzMzAd4yAagmkOyAddajOtTOb4G+YyQRa4Pnks77e 1eIanMvTGtp69PYMQIs6XV5FiWHzbdqQb49nn8TmpLcl+Vs8F7778Yz0Qy96M/F2YKos HT4A== 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=V2O8mJndySAqvWrcVscrHLamm5crmc8BHIFbuFF/RkI=; b=BomjzUZPJ5Ct9SP3fDoHkIXkEG7dRFyV79FlPB1rhhR94vDmzckjgEqebO7UbYku/i cwatUpp6I1uBcN+EpZL6edQcg+Yb9ZGVXmig6uAt7IcO0JqNQBO6XGrKyjxgAf+7dVEg oq5ONlmAbw3HFCkgtwTNsdgAzh4+dD+rnun0Yp6Wn75zbsvOUgyNLYd9dLXmiQLtJKfK b0YYtFVdleQXYQ8/Y0CDBSW4o/S3gXNyTVQMaz4T0RObmnBshbWh6h1isJxrQ97cNJdM 9eP09HPDFl3/UorwFRaG/x1ljORuy3Bu1gdMw9HKscYYyFzAnMhbt577+2jFrOxmHnaS eXlw== X-Gm-Message-State: AOAM530RKkFKer4tKFnq+33qaeBtUPDvMnyi6zXARHK2gnnpyt4Gt2BD ikxnHg9Aldg1rDwXzLiDZ5pvfyXSvpjLfg== X-Google-Smtp-Source: ABdhPJxZHoQ909t86yv0DzhBNgS5vixLPk5wY/q6z3mlLxSwD8zm2UaDIVc3Kqueggc1ERDdVXe8Tw== X-Received: by 2002:a50:e702:: with SMTP id a2mr38898714edn.3.1615926690765; Tue, 16 Mar 2021 13:31:30 -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:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Mar 2021 21:30:59 +0100 Message-Id: <20210316203100.528950-5-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 5/6] avcodec/options: Remove always-true check 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" Added in dc51a72ba45fbefb9f1c6c3ca5a5b2388d69b2da, yet even back then the check was always true as the AVCodecContext has already been memset to zero before that. Signed-off-by: Andreas Rheinhardt --- libavcodec/options.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 61689b48d9..53f13dab37 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -140,12 +140,10 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) s->reordered_opaque = AV_NOPTS_VALUE; if(codec && codec->priv_data_size){ - if(!s->priv_data){ 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);