From patchwork Tue Jul 6 09:20:06 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: 28833 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp4367473ybk; Tue, 6 Jul 2021 02:25:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/2Lq51SwPKzp/9Bdg8RdeLrPywbKeX+DE0KgFZbMTHAkk2rTXZqiFrxP3vt7VlXX831WD X-Received: by 2002:a17:906:9b8d:: with SMTP id dd13mr17636912ejc.168.1625563500389; Tue, 06 Jul 2021 02:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563500; cv=none; d=google.com; s=arc-20160816; b=WnhhGHUSpD6ULdGWSu/OTBWTDI3V12LQySEBydfAnI1hN2dNzHijATeM0aI2vDwqTR x7L42t8t1yLg7EGuwOiuodqLTKGm2NvW5X8B6uLgn73ItLPu+ZbJ6bWc7p8o2fvL0AEj jysTvbBluH2KWHik3ns2BFeIlEMrVAFa5R34dfWclqHBIxi6cuVTLucSJQ4z/dtNHWs/ +ZqEVWykLgR4ma/Ul/uZZYNm6gnipFA90Wv6di3dG6zVEEOloQXR9U5/SwD96dPv4zwV /AWEVs4broQJ1S9cU4t5TCMnFqFByxqaej64f9WXwgW7uvtrca3OzXtD54mo8vpBmXNh G6lw== 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=+kuaml8ht81jUriUkajf/mq3rOInxGfJrVd2RDKJg9U=; b=hjJ88yIFyQU7U5rE1vZBi/K1Bub4N9lQ0rOhlyxCvOitKx+AqRSAohB8Ps+xGYV0dq C1uN3L+RHcr/dTBHN6xQmtNwrJJC/ASnnNDJCJZKjJJTUmzRvBWkZQkfK/13+dI+vJiA PAQq9qlMviSd+yRGalgp6X8aAv369+ry2rD/Z+7b043gyhYS5RacoY70+oYUl4xuX1dr VHGCKE/B9CjptCYWTXdGnjEbxTAmTAm2iNUQx/eml51uZN999Wk/Wsjlmq7WZobNpfw0 bHZZK7JgSd9pFpdEy5cCBvFXtQYRhac1fucXafPmf4BwWHx9nlpgWIDx/2coCKnk4iyw rpxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C4dbdCWM; 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 l15si3596074ejo.194.2021.07.06.02.25.00; Tue, 06 Jul 2021 02:25:00 -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=C4dbdCWM; 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 721C268A817; Tue, 6 Jul 2021 12:24:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50C0968A81D for ; Tue, 6 Jul 2021 12:24:45 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id f13so10375926lfh.6 for ; Tue, 06 Jul 2021 02:24:45 -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=qkbHYUrU14uDT19T+xY2ZYh7EkHJUnhKrc8Ot4TNgRo=; b=C4dbdCWMbU67mtmp2T7X1ohmEMmk+xBa7v5vPtwaiQ6pFjMFYDwXAPCeJMZKNXle4X bG0/5U7iDnVbZXfyJj/9S7G7NXfcQkC/ZNGsK5edfG8SlS68YxhzNNOquIZxfQBsk3B7 /GKcOh7JdHrBbKkqWR/1ZqQgHD7ltrhnqx6jMQwwGMlyjvDbjZRwrPOV0RAmxFQSuvBx U+E+pz6B270IUnnSnSU0MAJAdbwqTkfQYTYBe+qzjwYfQ4c46I69emBYtyxYmj4haCTU gGhA6q8N4SPDgcWj69Kg26w5cLphgwMOl5Y+y8qF9wR3PWCk54fmTNzevAbdshkqVt/c AU4w== 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=qkbHYUrU14uDT19T+xY2ZYh7EkHJUnhKrc8Ot4TNgRo=; b=FSD2mYcs3MOhhZ/+uR3G+cCzaIBBxXdgvQQZG6F5fXfB+KqdWuF/flOqSri+bZNVRM y4KwGANt/T4BIZhkwimq6xhn2NnMjXIk0HeBSw8jfmyV9DPFZIGLysuQ74hu3sZAkl6g E05oWprmy+sT6mXbHp3/Qs26w+ktPbJKgbWB14nNlupVfXMm/MgFdWEZ+xIv/SvQ085B JkPlcJnT6oVIVEJc/ZNZgFYL4T3HuH398JfdQK7liBn22qb5zQ2mZ7O8oQtf5KkTW3Nd eUPUqOD51aLtuH6OR7r9BYKKJEOrLQx7udIkkoXv34XloniRVWIQ3Wf9+B9fqKk5at/V 8QmQ== X-Gm-Message-State: AOAM530CgDbEx/DwG/CmQmT9pTnwBgwbbFxzFWjmItsZVEd7nYcwLR65 +5n+hckK7xqRbcMwt7+g9kY5ftcRZus= X-Received: by 2002:a19:5e04:: with SMTP id s4mr14224973lfb.314.1625563484522; Tue, 06 Jul 2021 02:24:44 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id z9sm1201288lfu.120.2021.07.06.02.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:24:44 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:20:06 +0200 Message-Id: <20210706092020.1057-21-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210706092020.1057-1-dcnieho@gmail.com> References: <20210706092020.1057-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 20/34] 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: nZvqGfl2I/w3 Content-Length: 1295 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 695b9143af..e66906e91b 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -100,11 +100,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);