summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TOOLS/netstream/netstream.c4
-rw-r--r--libmpdemux/demux_ogg.c2
-rw-r--r--libmpdemux/stream_file.c2
-rw-r--r--libmpdemux/stream_netstream.c2
-rw-r--r--libvo/vo_xvmc.c2
-rw-r--r--m_option.c8
6 files changed, 10 insertions, 10 deletions
diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c
index 0cf9e121b1..e81e346861 100644
--- a/TOOLS/netstream/netstream.c
+++ b/TOOLS/netstream/netstream.c
@@ -197,8 +197,8 @@ int handle_client(client_t* cl,mp_net_stream_packet_t* pack) {
}
return net_stream_close(cl);
default:
- mp_msg(MSGT_NETST,MSGL_WARN,"Got unknow command %d\n",pack->cmd);
- if(!write_error(cl->fd,"Unknow command\n"))
+ mp_msg(MSGT_NETST,MSGL_WARN,"Got unknown command %d\n",pack->cmd);
+ if(!write_error(cl->fd,"Unknown command\n"))
return 0;
}
return 0;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index dd2a6c5ead..a98a01baf0 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -777,7 +777,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
//// Unknown header type
} else
mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d has a header marker but is of an unknown type\n",ogg_d->num_sub);
- /// Unknow (invalid ?) header
+ /// Unknown (invalid ?) header
} else
mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d is of an unknown type\n",ogg_d->num_sub);
diff --git a/libmpdemux/stream_file.c b/libmpdemux/stream_file.c
index 5fb74099f3..a32d19fbc1 100644
--- a/libmpdemux/stream_file.c
+++ b/libmpdemux/stream_file.c
@@ -72,7 +72,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
else if(mode == STREAM_WRITE)
m = O_WRONLY;
else {
- mp_msg(MSGT_OPEN,MSGL_ERR, "[file] Unknow open mode %d\n",mode);
+ mp_msg(MSGT_OPEN,MSGL_ERR, "[file] Unknown open mode %d\n",mode);
m_struct_free(&stream_opts,opts);
return STREAM_UNSUPORTED;
}
diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c
index b6b3e7bae5..52ebece44d 100644
--- a/libmpdemux/stream_netstream.c
+++ b/libmpdemux/stream_netstream.c
@@ -166,7 +166,7 @@ static mp_net_stream_packet_t* send_net_stream_cmd(stream_t *s,uint16_t cmd,char
return NULL;
}
- mp_msg(MSGT_STREAM,MSGL_ERR, "Unknow response to %d: %d\n",pack->cmd);
+ mp_msg(MSGT_STREAM,MSGL_ERR, "Unknown response to %d: %d\n",pack->cmd);
free(pack);
return NULL;
}
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 86cf9d52a2..4742572095 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -114,7 +114,7 @@ int attrib_count,i;
static void mDrawColorKey(uint32_t x,uint32_t y, uint32_t w, uint32_t h)
{
if( (keycolor_handling != 2) && (keycolor_handling != 3) )
- return ;//unknow method
+ return ;//unknown method
XSetBackground( mDisplay,vo_gc,0 );
XClearWindow( mDisplay,vo_window );
diff --git a/m_option.c b/m_option.c
index 825a085224..37dff3d723 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1347,17 +1347,17 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
char prefix[len];
strncpy(prefix,opt->name,len-1);
prefix[len-1] = '\0';
- mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: unknow posfix %s\n"
- "Supported posfix are:\n"
+ mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: unknown postfix %s\n"
+ "Supported postfixes are:\n"
" %3$s-add\n"
" Append the given list to the current list\n\n"
" %3$s-pre\n"
" Prepend the given list to the current list\n\n"
" %3$s-del x,y,...\n"
" Remove the given elements. Take the list element index (starting from 0).\n"
- " Neagtive index can be used (ie -1 is the last element)\n\n"
+ " Negative index can be used (ie -1 is the last element)\n\n"
" %3$s-clr\n"
- " Clear the cureent list.\n",name,n,prefix);
+ " Clear the current list.\n",name,n,prefix);
return M_OPT_UNKNOWN;
}