From patchwork Thu Jun 3 22:32:59 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: 28066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp535710iof; Thu, 3 Jun 2021 15:42:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHkbiEZIoX93iVG2+Fud0hvyNDlKPBWdItcz84zReD2rpZonntqf5R2n2mVtqJLYuZ2h3f X-Received: by 2002:a17:906:e4b:: with SMTP id q11mr1336397eji.404.1622760150495; Thu, 03 Jun 2021 15:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622760150; cv=none; d=google.com; s=arc-20160816; b=yekZTLon1geesLr6T6kcB9k0I92KOVM4EC5swMNmZ7zHPMKgEuYkF5zN2CfQqis5wQ ek9X5E2LHedj7wAFGe60edKuPgOthxyLHWgVgLm9O4RB2r82zjopwS0A7IjX1NKhrJi/ WKcSOgXznI+r3iSg+Wn0fJYUZ3AmlA7Vz/lYibuDHazyDiQIXTU5SPFr0MnlKkG0JgPm osCCiaoccD5gzO+h+h/I7UKHGuc9GT7efZgEQAtDPvuasCBX0VLlKBlyPGk0D2i2v2hk Cb2HgWTpmZ3GcBqaU0eZXr63mD6CDsb5Z9XHg0WO+YWO+qVx4O4+J7zH8yszHoXK7kLm exaA== 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=B35t/VYwXFCLriAIM+1iB6GdsUhAytApNpsw+PdhNv+FhuP6EIGJ2GBb5ogO0MOjrC I7FLIUImF+D6DvxQEFX7i2MoUE9eUulWlQPiqwNYobsKAioaIKPhv3EYGcLDA4kO1gHO MqPfm5KmGInxynIorLbrDaDBWnPC1IVQIbuXX/Av+d4ucnjX3mHcmEMJ+BruFksGUxJJ UXYJtK9p+4d6wrn1W2vZJkQgwKz+YyBns5I/PD04R7t5Tt0Sa/KQerA4gBM8mGFboGJR 8Meqmn/krqAUh8aAuS589LTPQB5iCqC30qMft3oQHlOYa1NzdAjjteDkum+UHAznwwX4 /Mpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LF83m7NO; 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 22si665640ejc.357.2021.06.03.15.42.30; Thu, 03 Jun 2021 15:42:30 -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=LF83m7NO; 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 0B57E68A148; Fri, 4 Jun 2021 01:42:28 +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 3A3E068A148 for ; Fri, 4 Jun 2021 01:42:21 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id a4so9134206ljd.5 for ; Thu, 03 Jun 2021 15:42:21 -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=LF83m7NOXY2jHxO33TFDH/++l6Lu1Ux5ClqzMqxwPTIorU/w6d21tm8G/OIGpaAsZL 11SDgp0kZ3h7K0MNFCgzxMD6F4mV4aAqFwLGPGJ1zgIWv4oGkaeJx7L8BP2cxgeZQzEF W84YKNx7yUFveitqmwCXf3np57sK/aX1b2u1KbyH4z839HAJTaPxcBSAyXgtN34ojeXk KwsPXIcX0S4Bf6oPM6N61esb8brfP8h7k5pWUX7nVujX2fDS/TKnwt0c/s4QQi0y4M9o vSuDfBL2k0Yi87DR/A0Ay1/HQxpNmyYO/xU3zuZH1Gjfp6LkRtwtsspctE3kNSfkEUdW o5Ew== 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=PS9lPazxFqxed3o+BdED17ya8jgTHYsUkvMZqISdPUUNmuvvqi9RtgXVZae5yc/7Lx bl0o23t67qqa0wAaDaK7qeVyfCq4ojLefHKgikZ101qFh9O3yuyl+443MXK406foMNnF cS7/PSf0L1mIfYiUdiEBA0fNAbP8PwZ2BY4OIwSlLPZKFYpiPYJEh6xKSQebJLaAqXPA 0xlAzLYbI6+KKUYXK5YuO7fCFp22V4MY6RKRiu6Eaehz0xmewRY6H6A0qBccUMWoudsC pMvjuQsM9b56RHZONqlENn+D+dLkkWK5ewyiJgW20R7gIuQEDSG9UoFor6vqAR2Lm4RJ +SGg== X-Gm-Message-State: AOAM533UpH932xpzoc2IQDyQ4JPaSTij51hfVbZDlvn8bioNuKQxF45U KuiEjd/CJ25DZwMeQ7EfJZrIqSnXto0= X-Received: by 2002:a2e:b895:: with SMTP id r21mr1111251ljp.369.1622759743440; Thu, 03 Jun 2021 15:35:43 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id b6sm236026lfa.296.2021.06.03.15.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 15:35:43 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Jun 2021 00:32:59 +0200 Message-Id: <20210603223302.1047-4-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210603223302.1047-1-dcnieho@gmail.com> References: <20210603223302.1047-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: OWLmyB67knE5 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;