From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D08F64114E for ; Fri, 25 Mar 2022 14:12:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77EBB68B270; Fri, 25 Mar 2022 16:12:09 +0200 (EET) 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-Google-Smtp-Source: ABdhPJzfBgQwIYiWXzhfZ0KwcwyCTl1ZEBbCnRa+0WPnGUofTQG1n4U1wBGXtINaBM2OrLfxjXaB9g== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.28.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".