diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-11 10:19:53 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-11 10:19:53 +0000 |
| commit | 5f65c05e35bdf4db0214325676c9325662bc8137 (patch) | |
| tree | 08a562c4ae2f5013f7a12571696dbe0b6630c78a /libmpdemux | |
| parent | aaf067719b6d4654e82833f602373579a32156c8 (diff) | |
| download | mpv-5f65c05e35bdf4db0214325676c9325662bc8137.tar.bz2 mpv-5f65c05e35bdf4db0214325676c9325662bc8137.tar.xz | |
make failures during e.g. setting the TV norm non-fatal.
Makes some (crappy *g*) USB cameras work with MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18074 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/tvi_v4l.c | 1 | ||||
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index f7194dfa40..c8cacbed52 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -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 } diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c index 6594f40f7f..7678e69532 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -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 ) diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index db52b0633d..f9ed7ab95f 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -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 |