MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd/avdevice: always free detected devices on error

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
This commit is contained in:
Lukasz Marek 2014-03-04 02:57:27 +01:00
parent 1aa262f460
commit 2475fdbd04
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavdevice/avdevice.c
View File

@ -101,6 +101,7 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToA
int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list)
{
int ret;
av_assert0(s);
av_assert0(device_list);
av_assert0(s->oformat || s->iformat);
@ -113,8 +114,12 @@ int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list)
if (!(*device_list))
return AVERROR(ENOMEM);
if (s->oformat)
return s->oformat->get_device_list(s, *device_list);
return s->iformat->get_device_list(s, *device_list);
ret = s->oformat->get_device_list(s, *device_list);
else
ret = s->iformat->get_device_list(s, *device_list);
if (ret < 0)
avdevice_free_list_devices(device_list);
return ret;
}
void avdevice_free_list_devices(AVDeviceInfoList **device_list)