videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavd/libdc1394: distinguish between enumeration errors and no cameras found 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Josh de Kock 2016-07-24 19:49:40 +01:00 committed by Michael Niedermayer
parent e947b75b1c
commit 384251daff
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavdevice/libdc1394.c
View File

@ -302,9 +302,14 @@ static int dc1394_v2_read_header(AVFormatContext *c)
/* Now let us prep the hardware. */
dc1394->d = dc1394_new();
dc1394_camera_enumerate (dc1394->d, &list);
if ( !list || list->num == 0) {
av_log(c, AV_LOG_ERROR, "Unable to look for an IIDC camera\n\n");
if (dc1394_camera_enumerate(dc1394->d, &list) != DC1394_SUCCESS || !list) {
av_log(c, AV_LOG_ERROR, "Unable to look for an IIDC camera.\n");
goto out;
}
if (list->num == 0) {
av_log(c, AV_LOG_ERROR, "No cameras found.\n");
dc1394_camera_free_list(list);
goto out;
}