summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_out/audio_alsa_out.c2
-rw-r--r--src/demuxers/demux_asf.c4
-rw-r--r--src/demuxers/id3.c2
-rw-r--r--src/video_out/video_out_opengl.c2
-rw-r--r--src/video_out/video_out_syncfb.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 3d5393f63..af8b4c351 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -404,7 +404,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
err = snd_pcm_hw_params_set_access_mask(this->audio_fd, params, mask);
if (err < 0) {
xprintf (this->class->xine, XINE_VERBOSITY_DEBUG,
- "audio_alsa_out: mmap not availiable, falling back to compatiblity mode\n");
+ "audio_alsa_out: mmap not available, falling back to compatiblity mode\n");
this->mmap=0;
err = snd_pcm_hw_params_set_access(this->audio_fd, params,
SND_PCM_ACCESS_RW_INTERLEAVED);
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index e2da05c75..1250ba9a5 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -1965,7 +1965,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
start_pos -= this->packet_size;
}
if (state != 5) {
- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: demux_asf_seek: begining of the stream\n");
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: demux_asf_seek: beginning of the stream\n");
this->input->seek (this->input, this->first_packet_pos, SEEK_SET);
this->keyframe_found = 1;
} else {
@@ -2101,7 +2101,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
default:
xprintf (stream->xine, XINE_VERBOSITY_DEBUG,
- "demux_asf: warning, unkown method %d\n", stream->content_detection_method);
+ "demux_asf: warning, unknown method %d\n", stream->content_detection_method);
return NULL;
}
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 755decaf4..f11e80e8d 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -60,7 +60,7 @@ static const char* const id3_genre[] =
"Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance",
"Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
"Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American",
- "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes",
+ "Cabaret", "New Wave", "Psychedelic", "Rave", "Showtunes",
"Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz",
"Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock",
"Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion",
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 648cd38c5..76040f623 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -955,7 +955,7 @@ static int render_setup_fp_yuv (opengl_driver_t *this) {
glGetIntegerv (MYGL_PROGRAM_ERROR_POSITION_ARB, &errorpos);
if (errorpos != -1)
xprintf (this->xine, XINE_VERBOSITY_NONE,
- "video_out_opengl: fragprog_yuv errorpos %d begining with '%.20s'. Ask a wizard.\n",
+ "video_out_opengl: fragprog_yuv errorpos %d beginning with '%.20s'. Ask a wizard.\n",
errorpos, fragprog_yuv+errorpos);
glEnable (MYGL_FRAGMENT_PROGRAM_ARB);
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index aaf7d43c7..b3385a943 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -996,7 +996,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
xprintf(this->xine, XINE_VERBOSITY_LOG,
_("video_out_syncfb: info. (brightness/contrast control won\'t be available because "
"your SyncFB kernel module seems to be outdated. Please refer to README."
- "syncfb for informations on how to update it.)\n"));
+ "syncfb for information on how to update it.)\n"));
}
/* check for virtual screen size and screen depth - this is rather important