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

fix typo in man page on VEEJAY_CAPTURE_DRIVER

Browse Source 
only use unicap when not using v4l2 (default: disabled)
This commit is contained in:
niels
2011-06-23 19:05:27 +02:00
parent b6f5699961
commit a6cde620bd
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
veejay-current/veejay-server/configure.ac
View File

@@ -237,6 +237,7 @@ if test "x$enable_v4l1" = "xyes" ; then
else
with_v4l2=yes
with_v4l=no
with_unicap=no
fi
dnl ********************************************************************
@@ -520,11 +521,11 @@ if test x$have_x86cpu = xtrue ;
then
if test "x$enable_debug" != "xyes" ;
then
if test $ac_cv_flag_sse = yes; then
if test x$ac_cv_flag_sse = yes; then
CFLAGS="$CFLAGS -msse -mfpmath=sse"
fi
if test $av_cv_flag_sse2 = yes; then
if test x$av_cv_flag_sse2 = yes; then
CFLAGS="$CFLAGS -msse2 -mfpmath=sse"
fi
fi

4
veejay-current/veejay-server/libstream/v4l2utils.c
View File

@@ -669,6 +669,8 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
}
v4l2info *v = (v4l2info*) vj_calloc(sizeof(v4l2info));
if( v == NULL )
return NULL;
v->fd = fd;
@@ -678,8 +680,6 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
dst_fmt = PIX_FMT_GRAY8;
}
veejay_msg(VEEJAY_MSG_INFO, "v4l2: Host running in %s", av_pix_fmt_descriptors[ dst_fmt ] );
if( -1 == vioctl( fd, VIDIOC_QUERYCAP, &(v->capability) ) ) {
veejay_msg(0, "v4l2: VIDIOC_QUERYCAP failed with %s", strerror(errno));
free(v);

2
veejay-current/veejay-server/man/veejay.1
View File

@@ -174,7 +174,7 @@ Do not start with projection enabled.
.TP
.SH Environment variables
.TP
.B VEEJAY_CAPTURE_DEVICE
.B VEEJAY_CAPTURE_DRIVER
You can set this environment variable to 'unicap' for capture
device detection and grabbing.
.TP

6
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -2024,14 +2024,16 @@ int veejay_init(veejay_t * info, int x, int y,char *arg, int def_tags)
el = info->edit_list;
#ifdef HAVE_V4L
int driver = 1;
char *driver_str = getenv("VEEJAY_CAPTURE_DRIVER");
if( driver_str != NULL ) {
if( strncasecmp( "unicap",driver_str, 6) == 0 )
driver = 0;
}
#else
int driver = 1;
#endif
if (vj_tag_init(el->video_width, el->video_height, info->pixel_format,driver) != 0) {
veejay_msg(VEEJAY_MSG_ERROR, "Error while initializing Stream Manager");