diff options
Diffstat (limited to 'libavdevice/decklink_common.cpp')
| -rw-r--r-- | libavdevice/decklink_common.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index da414ed5f8..b889033cf8 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -322,21 +322,14 @@ int ff_decklink_list_devices(AVFormatContext *avctx, ret = AVERROR(ENOMEM); goto next; } - new_device->device_name = av_strdup(displayName); - if (!new_device->device_name) { - ret = AVERROR(ENOMEM); - goto next; - } + new_device->device_name = av_strdup(displayName); new_device->device_description = av_strdup(displayName); - if (!new_device->device_description) { - av_freep(&new_device->device_name); - ret = AVERROR(ENOMEM); - goto next; - } - if ((ret = av_dynarray_add_nofree(&device_list->devices, - &device_list->nb_devices, new_device)) < 0) { + if (!new_device->device_name || + !new_device->device_description || + av_dynarray_add_nofree(&device_list->devices, &device_list->nb_devices, new_device) < 0) { + ret = AVERROR(ENOMEM); av_freep(&new_device->device_name); av_freep(&new_device->device_description); av_freep(&new_device); |