lavd/libdc1394: Do not crash if dc1394_camera_new() fails.

Fixes Ubuntu bug 1710849
pull/269/head
Carl Eugen Hoyos 7 years ago
parent f386dd70ac
commit 285c015f10
  1. 8
      libavdevice/libdc1394.c

@ -190,6 +190,14 @@ static int dc1394_read_header(AVFormatContext *c)
/* FIXME: To select a specific camera I need to search in list its guid */ /* FIXME: To select a specific camera I need to search in list its guid */
dc1394->camera = dc1394_camera_new (dc1394->d, list->ids[0].guid); dc1394->camera = dc1394_camera_new (dc1394->d, list->ids[0].guid);
if (!dc1394->camera) {
av_log(c, AV_LOG_ERROR, "Unable to open camera with guid 0x%"PRIx64"\n",
list->ids[0].guid);
dc1394_camera_free_list(list);
goto out;
}
if (list->num > 1) { if (list->num > 1) {
av_log(c, AV_LOG_INFO, "Working with the first camera found\n"); av_log(c, AV_LOG_INFO, "Working with the first camera found\n");
} }

Loading…
Cancel
Save