From patchwork Mon Jun 7 23:03: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: 28136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3886211iof; Mon, 7 Jun 2021 16:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpfkPhr/UDiyDOPT8GWQ2iAfxhl6S1EegdJSDxqrr1U0B0T+/Jia6XlCAA31YW1Dls6EgR X-Received: by 2002:a17:907:9486:: with SMTP id dm6mr19696612ejc.377.1623107121042; Mon, 07 Jun 2021 16:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107121; cv=none; d=google.com; s=arc-20160816; b=sVfHionlfP8RomTa8HcauGwS867m4qnDfWCzZDrb0X+wKhV2EviXXZ/vIuoABAp0TQ 85lC6k08Igbo++z/yaYtZT2R5wbIRl4S2V7rxr740gzY3H7LyXnsSCH1Y19QV5vdPgo8 ayEe410xdAl+mPl5Z3NB/SuI1fh8MiYggxKv6nNeFgWMzi/U6rIZyq3LEV1YqXm69g9x csVz3Aib59IdNdJSKlOYhWOrI5XJccZDIFUppGWeXsnVv4gn6utr4EtVW3Ver7eenCkA ELpvRqtIt7Toq1lRllN1y0qUpbMse+xquCwb928N3lN/lysXvx8wzs9H6GMWFYlJRcpy V4Vg== 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=TghckmX1Pn3ZLJf9wxhnODcK9Q89ziN9cpx0u4zRUm0=; b=rpxJrjylkLv3XAr83T+aarlM5aNbP9uf/KVKnj6Zi8NTrCrbV8FDTaOTeJ9Y12BeqH LkQ3oFo+fSoUt0KG4m8CaABTVHOFI0576nLM7q2ta5RWBzhvwAriUqsYuhiAN1Xk1SsD yzoXOs3wbptrE8c8EKbnR8fM8CC7kNytt/nOaNl97g1b+TDbechHcOEaUvmtSwn3IYW9 eWhh5I1UWj9lqHnqV0JtZ4F0IyA1zllU+62+QHAkV373go8XeKeO406jVRmpUPdekdjC B/aLj1UvKkzh3ii1QhR6TUaYJdT3AMTXe57Wu9kBU09xYuUfMaGSg5FzRVBl4Km6QN1y baBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nwnbh1uG; 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 bh7si13446429ejb.383.2021.06.07.16.05.20; Mon, 07 Jun 2021 16:05:21 -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=nwnbh1uG; 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 8BA4B680A2B; Tue, 8 Jun 2021 02:04:50 +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 A5B1E6808F2 for ; Tue, 8 Jun 2021 02:04:46 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id r14so5241748ljd.10 for ; Mon, 07 Jun 2021 16:04:46 -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=ZiiCuq0+yuRI6zFVdh40rJZEOdFRaD4mr1Cuqw8EbNU=; b=nwnbh1uGce3N8Q8VBCp9LFOR5vUh3qvG2pC/WU+/YQO9oXQS5aS89D/BDLwRiBsoRX 264hG4JzTNq9664cfwKc6+iAaH+oBTgf8K2xdkdv8SKi3u5Z2LfRVlP+rSjAZtWbMVLy 810iAODZ7Iv01p+zPXGP/HMd65kvE5dRmKIqLlYo9BFPdE+GL71fkWTReQu7tRptYQv/ xlMbWFIpBP4ZYzqf9yXJY7eIm6fRE77u34EJJTghfaIFl1BQuRwySzBNwgJQqV9nwJ00 RUlQJDVTAicIZrm9Er16zUe+7ki5iuKhX1Ig+OqR//4p3a5+bf23bAYM0yqH9Dd4CNo/ Ac9g== 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=ZiiCuq0+yuRI6zFVdh40rJZEOdFRaD4mr1Cuqw8EbNU=; b=pv5Fkmvbz6C0tGFOvQzPLFJVkN/W7MRGUzoAfkCgyREheMXoCs/GzzIhtrSZ+YhNgp CiRo/h4Sp+2nyEJPn6zzglBY5VBOTsoe1MGyxqwveE2ni1BB8gCVXyEkBgfL5wMRU0pJ K3T1LBcpXKRbriZcQNyK32ob/oII3iQAEoPM2e4wXiMX2DStvZ/AHIMYMXs0BIIwu0NY rwdqHd+H/muZaYWNPK+sZ/gxnysh0vLHlfTTYrajTvr3+F2J0gB5NIHe2Ukcy98klG7V Z+1WuRcmZmFaP16BhEywW+8/oiReLnyMWxIQXUYkat8dF0cb48XLqC6bygDV4DEc2dUs H/Gw== X-Gm-Message-State: AOAM530kcBBMSWanNLKSvjDQ1V0ctxmMKIwKPOQdv/qGk8HVTS53aK4w 3p6vmXQ3xCKrZo70wXdsh9avOOJqy8HDLg== X-Received: by 2002:a2e:8397:: with SMTP id x23mr16210289ljg.228.1623107085760; Mon, 07 Jun 2021 16:04:45 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:45 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:03:59 +0200 Message-Id: <20210607230414.612-21-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/35] 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: +AeffnYYXbVZ 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 695b9143af..d73d36e1dd 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -100,12 +100,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;