eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-17 13:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fix possible crash when unable to open v4l device

Browse Source
This commit is contained in:
test
2010-12-05 19:53:59 +01:00
parent c7b5c96a73
commit e1a469e20e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
veejay-current/veejay-server/libstream/v4lutils.c
View File

@@ -360,7 +360,6 @@ int v4lsetpalette(v4ldevice *vd, int palette)
int v4lgetmbuf(v4ldevice *vd) int v4lgetmbuf(v4ldevice *vd)
{ {
if(ioctl(vd->fd, VIDIOCGMBUF, &(vd->mbuf))<0) { if(ioctl(vd->fd, VIDIOCGMBUF, &(vd->mbuf))<0) {
veejay_msg(0, "v4lgetmbuf:VIDIOCGMBUF %s", strerror(errno));
return -1; return -1;
} }
return 0; return 0;

5
veejay-current/veejay-server/libstream/v4lvideo.c
View File

@@ -603,8 +603,9 @@ static int __v4lvideo_init( v4lvideo_t *v, char *file, int channel, int norm, in
if ( v4lmaxchannel( &(v->vd) ) ) { if ( v4lmaxchannel( &(v->vd) ) ) {
if( v4lsetchannel( &(v->vd) , channel ) ) { if( v4lsetchannel( &(v->vd) , channel ) ) {
v4lclose(&(v->vd)); veejay_msg(VEEJAY_MSG_WARNING, "Unable to select channel %d", channel );
return -1; // v4lclose(&(v->vd));
// return -1;
} }
} }