[FFmpeg-devel] [PATCH 20/35] avdevice/avdevice: clean up avdevice_capabilities_create
Diederick Niehorster
dcnieho at gmail.com
Tue Jun 8 02:03:59 EEST 2021
Draw implementation in line with that of avdevice_list_devices
Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
---
libavdevice/avdevice.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 695b9143af..d73d36e1dd 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -100,12 +100,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;
--
2.28.0.windows.1
More information about the ffmpeg-devel
mailing list