Merge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'

[ffmpeg] / libavdevice / libdc1394.c

diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index afffd89a8b7c9824b745bd77cc622d1af86c1c46..003335fdd88320d478d5ff42f75794d33c737df5 100644 (file)
--- a/libavdevice/libdc1394.c
+++ b/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 */
     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) {
         av_log(c, AV_LOG_INFO, "Working with the first camera found\n");
     }