From patchwork Fri Jun 11 20:30:51 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: 28215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp765493iol; Fri, 11 Jun 2021 13:37:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+OA4gmiDjw22hBXErqVGTnVLMbGqvu4cO53yA0kjx2S2JqR3AHjGNur1exZn4oYfJb0uB X-Received: by 2002:a05:6402:10d7:: with SMTP id p23mr5446821edu.74.1623443849215; Fri, 11 Jun 2021 13:37:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623443849; cv=none; d=google.com; s=arc-20160816; b=aTzH5NsBzDm1xVoaCRc/ZauwbDfLbb9A0FAnO7BjPC/wi/9O/mspFyXNauXSLCuYH4 yQVLRjFwgAw8FossdK3Q8lUVGaeaav92PmJJwdYbqhgQRWKusewpVflPP9TgJM8XfZYV nxSHXxeU3rv+8CQw/YCIizBb02K4HW5SqMzJ+LTKt4GoRW4XhQgDsGU2ddqPM1rNd/y9 FT2LOXhHM75X4Huj4XtuYxXwqk9DksbbjV3ET3ciCE/J12mFSiB42fOqknun3rNfDpce tKfmUsWb3IxjH/zIZx5fWv6N9G7FYFED1OzRv5sfax0OJURndZv/Z+lmlJdGyb9xfo+L yGBQ== 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=MxwMAVAEGwTpQuWxgqrJJ43QN8H0n+uidyQYONiQuq+/0eml+OgdVVIzsmhSyrNYkS Xxs52pDbw+FhjpUTvZ6aXVfOSIwrkQ+twk3TmY/PN73SHL1zy+w7iQlGIfvySIUijHN/ 1Wis5S85MQdTT12odhoOshVpxcvBJhOchjXgNSGWicnMuL3i5C2FKHH5BaLftREsrRgw OOVeBU90gAhXz80sF/QqYGVh8a+Hnj9lAt1soHSOq6PAoW2qqZX2OCCBu/VWY7lH57Mn qI49ElwwLOd24Lrb5aUmI+fkth8TFS8WtdWmWjmOkyf1kkE5HyTivO3oE/KgsIkXTn3b IJsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RfpY7g+g; 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 jv9si5670272ejc.70.2021.06.11.13.37.28; Fri, 11 Jun 2021 13:37:29 -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=RfpY7g+g; 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 67C51688388; Fri, 11 Jun 2021 23:37:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51B7F689902 for ; Fri, 11 Jun 2021 23:37:18 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id a1so10322585lfr.12 for ; Fri, 11 Jun 2021 13:37:18 -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=RfpY7g+gPbWLG/wQyVKWDTbvCEZSNc6XUb/B8QulAWFmzhyUQLGGOazVTThEd0RURw dWM/rs3kHs15uKdPziRFRjXXidRBlvZu6dYT8VCtyxBufueVfASK8ZveDgLPijCpnA+K Qt2Mcd+Nsx4KEziaUbKqKLdQqXBPXrxb4E22yIDnQBuE10cqv0tgaab8tOkWyIuhp/L2 LWhcLg/v9UQunnwnJTI5KutgoZO/FrnJXNp3gGGiUaS/8bVurEsaXfL1MNH33LZIIqml 4q4+eQAe3KUu93jJoJU9nIPzkHlFhVC3tU4Liy5Guh2MYftbxEIO8opg+cgAKsR9wkfV thYA== 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=H4ghLDXrN0n7WbZHtstU2Q3Ja6RfzPrDB5YwLlmeWNpym+cQ1hV90uY40ovqAYQGW2 OQnTQeFvglLFqTJJ+cYf9SKBiewLgAudzcSj+JBeL6xcHUFI1XWw++jGVLJ6NgJAIEfb 3JGWL5hQGSeXiXJ2g7ECIjH5AFTAIkKX+PdHCAgxnNVmzyPvWY79EfjQEpgSmotAfJ1i Pf0N0I43so8Elw4NV38GoWRd+2lrIuSV/IxqR1xLkv6QBBsnXYrzwmLsx2I9L1WOYlt4 H7sWil+AO6sdljFY4O3UDftMsx/rsWLSQbBlgsp3A8F05VofGILEVn4VAaX/HT1xqn3A NsZg== X-Gm-Message-State: AOAM531jXf75G52kSYgGo6ItdTWHVNdMSp2erbslX0dU7GBj9K3i3qMw /T8ZIS2NR7AMnY9znMX9M7j/S6cFc8rU7A== X-Received: by 2002:a05:6512:2283:: with SMTP id f3mr3731349lfu.523.1623443837468; Fri, 11 Jun 2021 13:37:17 -0700 (PDT) Received: from localhost.localdomain ([196.196.203.214]) by smtp.gmail.com with ESMTPSA id 10sm745339lfq.160.2021.06.11.13.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 13:37:17 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jun 2021 22:30:51 +0200 Message-Id: <20210611203104.1692-21-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210611203104.1692-1-dcnieho@gmail.com> References: <20210611203104.1692-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 20/33] 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: Z4gVpgXrjpIp 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);