RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

make failures during e.g. setting the TV norm non-fatal.

Browse Source 
Makes some (crappy *g*) USB cameras work with MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18074 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-04-11 10:19:53 +00:00
parent aaf067719b
commit 5f65c05e35
3 changed files with 2 additions and 4 deletions

2
libmpdemux/tv.c
View File

@ -224,7 +224,6 @@ static int open_tv(tvi_handle_t *tvh)
mp_msg(MSGT_TV, MSGL_V, "Selected norm id: %d\n", tv_param_normid);
if (funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tv_param_normid) != TVI_CONTROL_TRUE) {
mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n");
return 0;
}
} else {
#endif
@ -234,7 +233,6 @@ static int open_tv(tvi_handle_t *tvh)
mp_msg(MSGT_TV, MSGL_V, "Selected norm: %s\n", tv_param_norm);
if (funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) {
mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n");
return 0;
}
#ifdef HAVE_TV_V4L2
}

1
libmpdemux/tvi_v4l.c
View File

@ -799,7 +799,6 @@ static int start(priv_t *priv)
if (ioctl(priv->video_fd, VIDIOCSPICT, &priv->picture) == -1)
{
mp_msg(MSGT_TV, MSGL_ERR, "ioctl set picture failed: %s\n", strerror(errno));
return(0);
}
if ( !tv_param_mjpeg )

3
libmpdemux/tvi_v4l2.c
View File

@ -972,10 +972,11 @@ static int init(priv_t *priv)
return 0;
}
if (getfmt(priv) < 0 || getstd(priv) < 0) {
if (getfmt(priv) < 0) {
uninit(priv);
return 0;
}
getstd(priv);
/*
** if this device has got a tuner query it's settings
** otherwise set some nice defaults