From patchwork Thu Jun 3 22:45:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp537938iof; Thu, 3 Jun 2021 15:46:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt5WLwd48dngQs6gYABBLPLIDgi2Rjn1P0HOHo+R+xDXpGNYQ1a7kc8SFp9JWraa7l0SA6 X-Received: by 2002:a17:906:4f10:: with SMTP id t16mr1318040eju.337.1622760409788; Thu, 03 Jun 2021 15:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622760409; cv=none; d=google.com; s=arc-20160816; b=gqdL0Lqc7YTIm7OTp4ec3hZ3kQ7ewqsMLiPk4UGegJiHhM9OKuXTC3PgoL+a146Fw4 SuUhu9OGXmiuhvs34CYeRBtIjWUZKQYnKWJKiDT1QxAKiNK1ll/aMxSI3vOAnZmOToVM cpLf5hs7dTfY0QNI4pW9yZZYYbg+ITjhYTqX7DBrSSYVPtaQCeAl30dukImQJH+nfvEV G2oECL0E4FDsDL24Z4l8IaYVFikvcXJ7/zOCUbkz0/zV8k85YI+apZt9xfYnuUHQQofd yZv3LZtdSDfKai8azc97137cKeJFA60vQyMSy4BWI+knGX+wFg7Fb+72z21JiiO+Ls5L iZVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=GeVRf67AjPEeA+a12mk8khuUChSdWK3yOCGoW7AzFx0=; b=ByxMaTOsFmlYCjCp6h2DZfPaq6qQseA8sw0/3D9ydYmgX/mlpGMv/JgQUvTYHKLWIn H3CQb0F5GDg1kcRFKQhHG4BHc7pvtLml1rCHzuk92tQEu2vB14WDLC+RzdMNietwMHlf FaxyKcr7Gx1XRssCvF+nlCiIv3ZvDNE/57Lxg4wrQTrI7qq5Ud7e3ZcY0TxBMOibVFB1 XRm18J8VtxR4dMXk5poN4+okuS5/kWTsbTOr00qU3uvyzqfHpvg6tqZ0VuPJ99TJbqAi QXlNFDuM7hyieGd2umvGpKHJFBYG0xrOz6ZCL5AV/meJw5/Thxajzo4Utr3XGd6TY3/l QwVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FIa4oHM8; 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 f12si3201124edw.443.2021.06.03.15.46.49; Thu, 03 Jun 2021 15:46:49 -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=@gmail.com header.s=20161025 header.b=FIa4oHM8; 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 B36C868A295; Fri, 4 Jun 2021 01:46:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 620C668A252 for ; Fri, 4 Jun 2021 01:46:24 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id p20so9103160ljj.8 for ; Thu, 03 Jun 2021 15:46:24 -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 :mime-version:content-transfer-encoding; bh=1ae63w35O7aEQokppDL1xRCwApuaVqPd/cT3Xr6Q45k=; b=FIa4oHM8s/eop58+BVbg9dpglaItQgKzUdo02UDxLYe09PwlAjamhwbaqIAS/AVoQb SWYi7egd1NF5PRuYLQfaJwkBNzwjzdA6sb4BeybdFnsSfav807eQNGJG6qecmVNJz5cI 8OgaHb0KWkNe+HdAXwnbmQeDVZPB0MzJ+6Ph1xU2TVcTMRcBU8jRTTy/WWlr0o0J4S0Y JkZBl1SjCCI9T+TOktjAOaU6EIfUgzoCTQ0w+jsP99gvGezAZYKMOQ+FSX3q7oV1mxHe ClBwbreZqqv8yvMYF5OZeLgRM12KL9/HB44Aj0iNNbBr33NCcW+9S1u4bpsoN8dwVrEN vLxw== 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:mime-version:content-transfer-encoding; bh=1ae63w35O7aEQokppDL1xRCwApuaVqPd/cT3Xr6Q45k=; b=JasZVQSbq3gF9gEqLsHjeVTVOFXlPkq9G7SnyuOfz9zhdQ6VnnFOct5TalC/fcaykT pdulieC4P27eJcnjMZOZJ1au4tMdKuJRw68z45QMvi3scKpBUgHVt1G4ujNrYXIsBMRa Ak2YRfPipupohGFqF9/PH/ppkSKO0guvCglD5jX1Fl9OktQR/ygSlxoXbBLFebWWelDh rGeG8CpoNavmGFZ0RYZJ2b13HCw/Hv4rNSdrt7DfmYQRXpsjs3TsKvMy5ESfAAdwJB73 dl94baJ1g3vICSIRHoooDLewJO9QHoe40lP7Ww8WD6GfulyDs0MvHlZI8E4zYxOuK40A 8P4A== X-Gm-Message-State: AOAM533QvbgyYWfp96d2SpVIzbd5eId2NMUL6bAzw/iuFaNZBvJe74Hc MxUKMbXmS3bcDm9JCtjBph2v8d74tJQ= X-Received: by 2002:a05:651c:2049:: with SMTP id t9mr1112131ljo.180.1622760383542; Thu, 03 Jun 2021 15:46:23 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id t15sm82373lfp.176.2021.06.03.15.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 15:46:23 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Jun 2021 00:45:50 +0200 Message-Id: <20210603224552.1218-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210603224552.1218-1-dcnieho@gmail.com> References: <20210603224552.1218-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avdevice/avdevice: clean up avdevice_capabilities_create 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p2851Kqlm2zh Draw implementation in line with that of avdevice_list_devices Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 371ec17d02..2e64d35cf5 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -98,12 +98,15 @@ int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatConte AVDictionary **device_options) { int ret; - av_assert0(s && caps); + av_assert0(s); + av_assert0(caps); av_assert0(s->iformat || s->oformat); if ((s->oformat && !s->oformat->create_device_capabilities) || - (s->iformat && !s->iformat->create_device_capabilities)) + (s->iformat && !s->iformat->create_device_capabilities)) { + *caps = NULL; return AVERROR(ENOSYS); - *caps = av_mallocz(sizeof(**caps)); + } + *caps = av_mallocz(sizeof(AVDeviceCapabilitiesQuery)); if (!(*caps)) return AVERROR(ENOMEM); (*caps)->device_context = s;