|
|
|
@ -225,8 +225,11 @@ QVector<QPair<QString, QString>> CameraDevice::getRawDeviceListGeneric()
@@ -225,8 +225,11 @@ QVector<QPair<QString, QString>> CameraDevice::getRawDeviceListGeneric()
|
|
|
|
|
if (av_opt_set_dict2(s, &tmp, AV_OPT_SEARCH_CHILDREN) < 0) |
|
|
|
|
{ |
|
|
|
|
av_dict_free(&tmp); |
|
|
|
|
avformat_free_context(s); |
|
|
|
|
} |
|
|
|
|
avdevice_list_devices(s, &devlist); |
|
|
|
|
av_dict_free(&tmp); |
|
|
|
|
avformat_free_context(s); |
|
|
|
|
if (!devlist) |
|
|
|
|
{ |
|
|
|
|
qWarning() << "avdevice_list_devices failed"; |
|
|
|
@ -242,7 +245,6 @@ QVector<QPair<QString, QString>> CameraDevice::getRawDeviceListGeneric()
@@ -242,7 +245,6 @@ QVector<QPair<QString, QString>> CameraDevice::getRawDeviceListGeneric()
|
|
|
|
|
devices[i].second = dev->device_description; |
|
|
|
|
} |
|
|
|
|
avdevice_free_list_devices(&devlist); |
|
|
|
|
avformat_free_context(s); |
|
|
|
|
return devices; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|