diff mbox series

[FFmpeg-devel,2/4] avdevice/avdevice: clean up avdevice_capabilities_create

Message ID 20210603224552.1218-3-dcnieho@gmail.com
State Superseded, archived
Headers show
Series avdevice/dshow: implement capabilities API | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Diederick C. Niehorster June 3, 2021, 10:45 p.m. UTC
Draw implementation in line with that of avdevice_list_devices

Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
---
 libavdevice/avdevice.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 371ec17d02..2e64d35cf5 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -98,12 +98,15 @@  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));
+    }
+    *caps = av_mallocz(sizeof(AVDeviceCapabilitiesQuery));
     if (!(*caps))
         return AVERROR(ENOMEM);
     (*caps)->device_context = s;