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 C27B84055A for ; Tue, 21 Dec 2021 12:14:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C770B68AFE9; Tue, 21 Dec 2021 14:13:54 +0200 (EET) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C305268AFDD for ; Tue, 21 Dec 2021 14:13:53 +0200 (EET) Received: by mail-lf1-f47.google.com with SMTP id x7so4345593lfu.8 for ; Tue, 21 Dec 2021 04:13:53 -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=boDRaBTUcmRXyz/txcZJIyTJMcGyGX47/tDb0pfZQhvW0SPnKf8JOfM4f8zgqd0nio mFGGyiPqdS7a1CHCs3Wd1Nl6qt4SIj+V8wOAn4QNHBPHerYB4aZCrZphbuJlgYIra+zr LyQGRdlc9NabvnnDvjv65S0BHjaIJszeVOLrTq9BdNy9puJEwSkJDmRIAOXv3PxbntyY kAd97oAohV5JOVglFE9O8RL35eSnbUcCNz5/VU9XM2WMgZNOsfjzfVa7Hiv3py03Ssim /+s5FEk9H+nDNJjKxdxHtRP0n7JQKNGuIxC4YJGrvVtcyotPMZPDyeHF8MuQXLpjUKgj nuyA== 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=FKpHaadx2LWJmM6mH4u/ZZnyR0gf96e+H9aWUIh9EuhGej1lNRVuRzqJGYqvK4iUc3 vn2wW5qJGUhq2I5MMrgh1l2EE36578OaBuaDXX5g2uAz2WDpLYex59/QS3hylrlwfk51 fW3Z9CdVbHae3dXb8s+CZ/+lz6E1YgEwimi8nlK9ZjjWpEC079cMt7Umzf8AT1gbhe48 3bUzsQ3v95Z2Wtx6NPeHejcaJRAn5vCkHCUUgF/QKbZ44swaUVp4aowjSe4zmfYXzIHK ZMD3S3zWFdwzArd7CHzAkmfM5ADCzqv03cYv+ru7+KvSWr+x3nfYSQFp7L0fXar8bJTw S2JQ== X-Gm-Message-State: AOAM533W+moHbm/DlNFrgtnkl59LhC71udAjNfUlry/wbSyvfdyo0My1 97SSsbC1S52KbZ6xYhRRptZkupb8lw2i6A== X-Google-Smtp-Source: ABdhPJx7aMlC7gvznI9NGLRbv1+42jpaX3ynZGq+w2KsYj99z6WmF1SxIbmOWpxkrQQw3yzu8nUzrQ== X-Received: by 2002:a05:6512:388d:: with SMTP id n13mr2691207lft.109.1640088832617; Tue, 21 Dec 2021 04:13:52 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id p6sm28403ljg.69.2021.12.21.04.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 04:13:52 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 13:12:36 +0100 Message-Id: <20211221121239.1201-10-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221121239.1201-1-dcnieho@gmail.com> References: <20211221121239.1201-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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".