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 EDBB140595 for ; Tue, 21 Dec 2021 13:55:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58E3D68AF4C; Tue, 21 Dec 2021 15:54:58 +0200 (EET) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECD6968A897 for ; Tue, 21 Dec 2021 15:54:57 +0200 (EET) Received: by mail-lj1-f175.google.com with SMTP id i63so21511812lji.3 for ; Tue, 21 Dec 2021 05:54:57 -0800 (PST) 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=v2kXJOQXp1FSsiOyRIGlHOZj4JiIWVkJ1nszCAPlQyM=; b=KyOANBO6voKZm0dLwpMrJxwpYST0ZAKAKh6aEqnjWBwy6jox4RMQ5linfr3uyssGyJ qBmyi+3Ne/ockcKojenV+fQHLg2qcpCLCm+sFjeybm41ir9LLSnXg3TeU97iiQi2AmzM OAEZwGXjlnrB4vUspy68rY7CGopC40Pvq9814356/rUffMhiSFOsxKFQ+n38s9NtdTGl 2VLGxmt099WnzGoeCgJD3QJBJoUkzjAj8Em7OGb5wJU3kz1un1A8LEqolFubUTpaSExJ 1LYLkTPsRRkeTHNpJW+kNbDoc3arktpz122r11FPP4xjviyTZdDXGbMaUhpAi7OJSEO3 rEdw== 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=v2kXJOQXp1FSsiOyRIGlHOZj4JiIWVkJ1nszCAPlQyM=; b=x9JhH8MVdpMZmemHcMLnefTe81RABCDWgJbfWfTpuyIur76FDth9RM1Em9GIMKf8QH 9+jRnw0InkQEeIoA0waUEjWqelZO2joGpGbdcr5BuAtq+fTIVovjXj3B/ZoB/c7YQP81 tlKxlUvKDHDlbAkoUtoL10ZDOKf6PCp+97tGpBWA8Fk+DSvj8LpLk0zBpwKO5tPD5B0l vvjRHCrPzZDXLsEeud6T1czXDbujQ/SZN/RSkFfIzRMkw/ESSFueAGL1UuJ2G0d8c8TH GscRBLxvxwHxqNrdecLq3X28DMK2M9YcDiX+uy6GMeUPZabLpKzXblOJcVxXyZZc2J5h usaw== X-Gm-Message-State: AOAM530MvW918ikrpqTgocyq/BcJoVcrJw5eYSQkzQynpFO8uRbTAHK/ BvhLze/FdchOiBspez3KjFZcv06GlgThxw== X-Google-Smtp-Source: ABdhPJzBN+mZyqVbMjcOZEQetR+g0fzgSsfMVd70ptXr99vQokyh5UTmuDliLn0eHxiT1X3a4csc4g== X-Received: by 2002:a2e:3012:: with SMTP id w18mr2573554ljw.217.1640094896820; Tue, 21 Dec 2021 05:54:56 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id l4sm2627085ljg.60.2021.12.21.05.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 05:54:56 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 14:53:34 +0100 Message-Id: <20211221135337.1348-10-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221135337.1348-1-dcnieho@gmail.com> References: <20211221135337.1348-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 09/12] avdevice/dshow: add media type info to get_device_list 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: The list returned by get_device_list now contains info about what media type(s), if any, can be provided by each device. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 8dba04a787..4b1e942c7a 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -384,6 +384,12 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, sizeof(*(*device_list)->devices)) < 0) goto fail; + // attach media_types to device + device->nb_media_types = nb_media_types; + device->media_types = media_types; + nb_media_types = 0; + media_types = NULL; + // store device in list (*device_list)->devices[(*device_list)->nb_devices] = device; (*device_list)->nb_devices++; @@ -412,6 +418,7 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, if (device) { av_freep(&device->device_name); av_freep(&device->device_description); + // NB: no need to av_freep(&device->media_types), its only moved to device once nothing can fail anymore av_free(device); } if (olestr && co_malloc) -- 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".