From patchwork Wed Mar 30 12:17:53 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: 35063 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp774150pzb; Wed, 30 Mar 2022 05:19:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLXjie9XaBLCAenw/Tbt0WVBAuOnHzC/jHM+TyrKLUIiFFNM1MZrOOspUFIDIww/bYUb60 X-Received: by 2002:a17:907:6296:b0:6da:64ee:1031 with SMTP id nd22-20020a170907629600b006da64ee1031mr40385190ejc.601.1648642788730; Wed, 30 Mar 2022 05:19:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648642788; cv=none; d=google.com; s=arc-20160816; b=eYEciAKlgThExXrmWphbI74/JqFdGUIxW0sTIKZuUYoSngsbncl0KgPv2tSoUe7Eq9 +SbRwAnNMe/14Q6MpjQtMnR4JDtGjFLv8Gw6sRd/j+ay7ry/b+MpHbsUWyK4qwBxumor kNP0yEDTTdBlGfdlvExtIGexU9UYf2dCBSGIicHia3yPD5f62ZpikAlBDFM5iCmhc3Vz OaiiCvicpJKQZUqaTROITjll2VIdyvfya2j8m4e9kumpQ2rga65ooJUX24ai7EEJU5hi lr6Qt+/SAYEZteEXCiDnfQhS/MkU1uplqNDsYRj+HZBhoncDc0GuPxOJH5eYyizh+HEO J7Xg== 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=ubDKRAXi6lW2gdJi65/9f21N+fjIg8+M+wjbo2KYz8w=; b=yGiK4seinNgCv+m5PHxGC0UJH/hr0jDyfDnw7mFGD2Ep6ioHye+dDXUJYcLJU0Tk/9 5gjJGEgeBMIup2zN0REDB0CrPUvl1+HD+2GKFiFzGYf3GRBqc7MS1FVYHAdAGHnP2cVU asOPPu9B9G+4iZFAP38iDWcDTQ07ma2Kb0sfhtSnf/hGOKxxuh3SUu68ZyvedHwwA6Jn ZmdIR2wAagtYmQtZN0DTsOptj2AhLsf1jWtIpEbQSyqlqHMi/HIr0s4D26x3Mi7BkMd5 soknPXJZzGNDKf5zz+HMG6ZqscWj6Tm2rcysyROluvLYXi7tN7EnsbG1rNKD1bCwpYt3 JOcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=B78T4hfw; 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 jp11-20020a170906f74b00b006df76385dcbsi19956825ejb.619.2022.03.30.05.19.48; Wed, 30 Mar 2022 05:19:48 -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=B78T4hfw; 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 9173368A896; Wed, 30 Mar 2022 15:19:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C55CB68A896 for ; Wed, 30 Mar 2022 15:19:13 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id c15so27387532ljr.9 for ; Wed, 30 Mar 2022 05:19:13 -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=jrXkYFjbGW+XlcDoUpFKKVfIX7B/8yEeCovCp33upOI=; b=B78T4hfwEai2gbjaYLDqeJ1h7CKad7QQ2Vr378VuLSQq1LR5n5myCTuPit5jTsQVuj JYGXDd2aT3yKcMLm5SGHLXK9AmNCReWaGRl4HSzoZ+tdug+uVsuw9SdadXqRTA0nch7r ek0jMkgpTYSVYoHSAWMrNF12bYtJDjIlhyEGi/ZkNvrrKhoN4yiWbkudI5XnscrTQBhl x24J1uWm+IOgo0oHFZMRfG/ZziE9woffMxgtypulkEdVILAem69+AlAq8AIucBqANXRD 52ao+h2IYGRi9GO42cMXwbGTrUroxjENwGKb1zZAfEpnERTVGZwmG4sd3+n3vMaGnEJA jSBg== 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=jrXkYFjbGW+XlcDoUpFKKVfIX7B/8yEeCovCp33upOI=; b=6n5Zy+kdTX46qsS5nZQ627xFIXbtq5i2De2aA9wts8lRgj4GpbqoiZTff8tngmbrnP RS1Oqmttv4GKSuhXrPA8i/yEnf/iQctitHJDdQSCjHLSOXxM/cG7Of/vi9kGpFgvufhK a4xf71PkBrAwIFRgXHy0eGb64iB8ZDfs7BOaQm3MXaMliKe5PcCWFxYIcZ3Rc9W9gA1h apg2IQ5boAWERFYhIOoO3GcgkWYtB6VWd8Qavjem2DjlbRGyKtZnAAxtPYDh2eOCy7dk r81RSDgKS+ahNivNI7LW/QyPOawZAT5uPynNVhxrPmSxQe5+gcW7X0H7GU/YPvJf3W0N F3fQ== X-Gm-Message-State: AOAM5308JAFdDXoXs9ZF+rUYLdlIVogiAUK4Guigwc9VSJU/PB9JSyp3 tv6gfCt/OHnuQ1Sp7ZCZOfrKgMSlqy4= X-Received: by 2002:a2e:9990:0:b0:249:88f6:f637 with SMTP id w16-20020a2e9990000000b0024988f6f637mr6380956lji.14.1648642752595; Wed, 30 Mar 2022 05:19:12 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id u11-20020a19600b000000b0044a37ab974fsm2307922lfb.51.2022.03.30.05.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 05:19:12 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Mar 2022 14:17:53 +0200 Message-Id: <20220330121806.822-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220330121806.822-1-dcnieho@gmail.com> References: <20220330121806.822-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 08/21] 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: QB+tWswY1TDd 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 d367189532..2e8261e0d2 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);