diff mbox series

[FFmpeg-devel,v7,09/12] avdevice/dshow: add media type info to get_device_list

Message ID 20211221135337.1348-10-dcnieho@gmail.com
State Accepted, archived
Headers show
Series dshow enhancements | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Diederick C. Niehorster Dec. 21, 2021, 1:53 p.m. UTC 
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 <dcnieho@gmail.com>
---
 libavdevice/dshow.c | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series

Patch

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)