[FFmpeg-cvslog] avdevice/dshow: add media type info to get_device_list
Diederick Niehorster
git at videolan.org
Fri Dec 24 10:40:48 EET 2021
ffmpeg | branch: master | Diederick Niehorster <dcnieho at gmail.com> | Tue Dec 21 14:53:34 2021 +0100| [e4b9aee11c5fff00eb7a491552dca1fe52b1264c] | committer: Gyan Doshi
avdevice/dshow: add media type info to get_device_list
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 at gmail.com>
Reviewed-by: Roger Pack <rogerdpack2 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4b9aee11c5fff00eb7a491552dca1fe52b1264c
---
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)
More information about the ffmpeg-cvslog
mailing list