diff options
Diffstat (limited to 'stream')
-rw-r--r-- | stream/ai_alsa.c | 2 | ||||
-rw-r--r-- | stream/ai_alsa1x.c | 2 | ||||
-rw-r--r-- | stream/pnm.c | 2 | ||||
-rw-r--r-- | stream/tvi_v4l.c | 8 | ||||
-rw-r--r-- | stream/tvi_v4l2.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c index 3d8e70c1b5..c5e2f3f623 100644 --- a/stream/ai_alsa.c +++ b/stream/ai_alsa.c @@ -78,7 +78,7 @@ int ai_alsa_setup(audio_in_t *ai) assert(ai->alsa.period_time >= 0); err = snd_pcm_hw_params(ai->alsa.handle, params); if (err < 0) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to install hardware paramameters: %s"); + mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to install hardware parameters: %s"); snd_pcm_hw_params_dump(params, ai->alsa.log); return -1; } diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 5035e980f7..3b9e878730 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -93,7 +93,7 @@ int ai_alsa_setup(audio_in_t *ai) err = snd_pcm_hw_params(ai->alsa.handle, params); if (err < 0) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to install hardware paramameters: %s", snd_strerror(err)); + mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to install hardware parameters: %s", snd_strerror(err)); snd_pcm_hw_params_dump(params, ai->alsa.log); return -1; } diff --git a/stream/pnm.c b/stream/pnm.c index 95bfc8dc9b..40da142b33 100644 --- a/stream/pnm.c +++ b/stream/pnm.c @@ -379,7 +379,7 @@ static int pnm_get_chunk(pnm_t *p, case MDPR_TAG: case CONT_TAG: if (chunk_size > max || chunk_size < PREAMBLE_SIZE) { - mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceded (max was 0x%04x)\n", max); + mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceeded (max was 0x%04x)\n", max); #ifdef LOG n=rm_read (p->s, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE); hexdump(data,n+PREAMBLE_SIZE); diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index 819f0e2e01..4f73c03bec 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -496,14 +496,14 @@ static int init(priv_t *priv) /* get capabilities (priv->capability is needed!) */ if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno)); goto err; } fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC); mp_msg(MSGT_TV, MSGL_INFO, "Selected device: %s\n", priv->capability.name); - mp_msg(MSGT_TV, MSGL_INFO, " Capabilites: "); + mp_msg(MSGT_TV, MSGL_INFO, " Capabilities: "); for (i = 0; device_cap2name[i] != NULL; i++) if (priv->capability.type & (1 << i)) mp_msg(MSGT_TV, MSGL_INFO, "%s ", device_cap2name[i]); @@ -810,7 +810,7 @@ static int vbi_init(priv_t* priv,char* device) } if(ioctl(vbi_fd,VIDIOCGCAP,&cap)<0){ - mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev); + mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev); close(vbi_fd); return TVI_CONTROL_FALSE; } @@ -1397,7 +1397,7 @@ static int control(priv_t *priv, int cmd, void *arg) } if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno)); return TVI_CONTROL_FALSE; } diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index c189a861ba..91f574f901 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -609,7 +609,7 @@ static int vbi_init(priv_t* priv,char* device) } if(ioctl(vbi_fd,VIDIOC_QUERYCAP,&cap)<0){ - mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev); + mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev); close(vbi_fd); return TVI_CONTROL_FALSE; } @@ -1263,7 +1263,7 @@ static int init(priv_t *priv) (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG1) ? " LANG1" : "", (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG2) ? " LANG2" : ""); } - mp_msg(MSGT_TV, MSGL_INFO, " Capabilites:%s%s%s%s%s%s%s%s%s%s%s\n", + mp_msg(MSGT_TV, MSGL_INFO, " Capabilities:%s%s%s%s%s%s%s%s%s%s%s\n", priv->capability.capabilities & V4L2_CAP_VIDEO_CAPTURE? " video capture": "", priv->capability.capabilities & V4L2_CAP_VIDEO_OUTPUT? |