From patchwork Fri Mar 25 14:10:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 34971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376771uaj; Fri, 25 Mar 2022 07:12:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHVViG2nDXYGR1ro49R/pEHtbGeO/kGjWECSA3w+M5eRW9Y1p8URo/XC7d3vEf60FlDgk4 X-Received: by 2002:a17:907:2ce3:b0:6df:b0ad:1f1a with SMTP id hz3-20020a1709072ce300b006dfb0ad1f1amr11802475ejc.392.1648217579439; Fri, 25 Mar 2022 07:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217579; cv=none; d=google.com; s=arc-20160816; b=wP5iCkjjM/f/NHyS7xJjqrpiH+BhXk8BUDiAtR0lOgRdsu9wiJ/OmPdIQUaO+KxKLm 1sKIqwvGRUMWKmqHeJHZh/Bo+C4+2HEbvYwhv+Oi8I5MaA4TlpUljg5NnS0PnJFYoTwb K8a+u6e8uLWiZfPrmXZWG9b1JnLNdfTqD4fJ0G2FWZTt+/ez7hn/qGwMNZngY6ohiXjD PRXN98+HVwZGqxcx0ntca1J8nSl6FtdPj7O1+rGpV1LTo+kKjSs9HChizkbLftyQ06vM zmd6PJy0flBK3X9/7+MHDwSVq/m8z7LUBvrUDr2bvmpGZTwX8NTDQNIhnVMQ6kHuqxQ3 VJ6g== 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=4/vfbo+T84ev29/+KUJJzDUDf7WDIc3U8mnbvMJ0I7E=; b=PIqbcCPC2T4qDev9/fr1RietNmAE5hkG9cmzvC1mbggNevUSMonv6jEyKWX3AYrjBG wfFd/A+jG03z3lTN/+dktp4cCOh2jQK4KAxkxe0K0Gh+oRWC+5QDV3CgZRtpHd/TQ7Kx EeplG12L8Y/nChbiOhaYVQDTK7gJnc02/VR3hHUuJlmvr9mlygXaAkwC5vmQaEwixtbn cEQDyXMAUn26Rlzh3rcDzFiES0OPsQuJqYVBkTMbFEUfI8s+C/O1LubRM+/Q+XPuPs2i oV06GP7H4wbCzowpzkd1EtQ0UTAbO17+qwDa7hXxzp/SAmt1yhicJoF2tDYsDZqR2syS iMCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F+OKke1g; 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 v12-20020a170906380c00b006e0829ae7a0si2597627ejc.51.2022.03.25.07.12.59; Fri, 25 Mar 2022 07:12:59 -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=20210112 header.b=F+OKke1g; 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 A696C68B274; Fri, 25 Mar 2022 16:12:09 +0200 (EET) 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 E826B68B229 for ; Fri, 25 Mar 2022 16:12:07 +0200 (EET) Received: by mail-lj1-f180.google.com with SMTP id b43so5948984ljr.10 for ; Fri, 25 Mar 2022 07:12:07 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=80soOFwT8QpRk4qENTX2E/+2lOGQpKWaDuvDVFAV6Qk=; b=F+OKke1gggu1K1YQOVT422Ux5nHFHLYGraVeCVo0zPi3s1KnxXgCl7sVOCkurXajVs SyXWI1qbHQmV+GAczPw15yfAvTnuqKFsgF4f9XNUXgcHSjZwWVZle+Sz6MppFHSDcQ5a 37A1lB4CEr6NtJmDD7WsaYy4f5DmZZxA7PKTWS2NSvPs7n4tsaojtN5jyNCLolTCHugk mewEx+SAy/ASvLsDjgnezTyZrVwYoQVQo0dOndfmzXOje5igBZC5oIUx7SoszXRy8bC3 eJSY+HXTjkS096aBKG+gk12+Qaj9eymklFcH7k1BmJUFtN/nG28XkfKKIgj04sAp3M/D bfnQ== 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:mime-version:content-transfer-encoding; bh=80soOFwT8QpRk4qENTX2E/+2lOGQpKWaDuvDVFAV6Qk=; b=j8536tS0n3NLoXuSiQzNe+yHiXqhQLTFCnKv2uIWVfz7IIxf9envKwz3iF/ZjX3ULM A4/NPmpT8dYprfIDgVjLhzngtN9xxIeOjvlFaZBIPA4gbY7Jc5SLeju6Lismuup7LZeF AjUKchyLH7SbWztaVQPXavAA746m2sOWINIMjfFueOGsejmzciSq67GnBeeoogVMYVhy UTHLxBgKJzuCZNlfYkkkbkvXQbu4Wx+FVeuKegxsNtbg7LeNBz422GmmXO7cxRAuXrdu xRh6/Y9MyoUBmPCSPgqnoXYz4lCltgGHv7SbgJsBAxglCcvUOyF20iwYdQkqLvWDYJlk 1qeQ== X-Gm-Message-State: AOAM533fQXCyYtQOjdft5D/GEJfCGIc1JWaZXDfrKpn8I9DnYJwDOQuG lOr7svkGILz/VlpycpEIXEHdRvRFwkk= X-Received: by 2002:a05:651c:2118:b0:249:20cb:a42 with SMTP id a24-20020a05651c211800b0024920cb0a42mr8425481ljq.157.1648217526584; Fri, 25 Mar 2022 07:12:06 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id u26-20020a19ab1a000000b00449fb00eef6sm720093lfe.209.2022.03.25.07.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:12:06 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:28 +0100 Message-Id: <20220325141041.1748-10-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com> References: <20220325141041.1748-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 09/22] 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: shXR0S51C93F Draw implementation in line with that of avdevice_list_devices Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 2000e63bb2..24e14b84c9 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -113,11 +113,14 @@ 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)); if (!(*caps)) return AVERROR(ENOMEM);