summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-21 10:05:46 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-21 10:05:46 +0000
commite1547563a929a1b923a708f7d9df062d68a2d11d (patch)
tree1ab0435bd01460e7a214bc35d3186cc980cc1973
parent6177b518416c601f93d93ff75d96b759ed3192a2 (diff)
downloadmpv-e1547563a929a1b923a708f7d9df062d68a2d11d.tar.bz2
mpv-e1547563a929a1b923a708f7d9df062d68a2d11d.tar.xz
cosmetics: Fix some common typos, sepErate --> sepArate, deciSSion --> deciSion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22301 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/tech/oggless-xiph-codecs.txt10
-rw-r--r--Gui/win32/Changelog2
-rw-r--r--TOOLS/subfont-c/font.desc.tail2
-rw-r--r--libmpcodecs/vf_mcdeint.c2
-rw-r--r--libmpcodecs/vf_remove_logo.c4
-rw-r--r--libmpdemux/demux_viv.c2
-rw-r--r--libvo/vo_bl.c2
-rw-r--r--subopt-helper.c2
8 files changed, 13 insertions, 13 deletions
diff --git a/DOCS/tech/oggless-xiph-codecs.txt b/DOCS/tech/oggless-xiph-codecs.txt
index 9ddf48f081..e0c9ea15bb 100644
--- a/DOCS/tech/oggless-xiph-codecs.txt
+++ b/DOCS/tech/oggless-xiph-codecs.txt
@@ -14,7 +14,7 @@ License GPL + GFDL + anything neeeded to turn this into a open standard
Minimum container requirments:
This appendix only explains how to store xiph codecs in containers which
-support at least one global header per stream, can seperate individual codec
+support at least one global header per stream, can separate individual codec
packets and in principle support the codec, so for example in the case of
vorbis that would be variable bitrate and variable number of samples/packet
Storage in other containers is outside the scope of this appendix
@@ -25,7 +25,7 @@ Global header:
If the container can store 3 headers per stream in an unambiguos and ordered
way then they shall be stored in that way, if OTOH the container is only
capable to store a single global header then the 3 codec headers shall be
-concatenated without any additional header, footer or seperator between them
+concatenated without any additional header, footer or separator between them
to recover the 3 headers from such a global header the following procedure
shall be used:
@@ -48,7 +48,7 @@ for a global header chunk then glbl shall be used
Storing packets:
Each codec packet shall be stored in exactly one "container packet"
and one "container packet" must not contain more then one codec packet
-"container packet" here means the smallest seperateable unit of data in the
+"container packet" here means the smallest separatable unit of data in the
container
@@ -113,12 +113,12 @@ storing xiph codecs in nut
Example and Disscussion of mpeg-ps / mpeg-ts container
These containers neither support a global header nor provide the neccessary
-packet seperation / framing, so storing xiph codecs in them is outside the
+packet separation / framing, so storing xiph codecs in them is outside the
scope of this appendix
Example and Disscussion of wav container
-wav does not provide the neccessary packet seperation / framing, so storing
+wav does not provide the neccessary packet separation / framing, so storing
xiph codecs in it is outside the scope of this appendix
diff --git a/Gui/win32/Changelog b/Gui/win32/Changelog
index d439fa9dcd..1e831ee65a 100644
--- a/Gui/win32/Changelog
+++ b/Gui/win32/Changelog
@@ -297,7 +297,7 @@ Erik Augustson <erik_27can@yahoo.com>
pre4
- URL open
- use windows native menus
-- Gui runs in a seperate thread now because some controls interupt playback :(
+- Gui runs in a separate thread now because some controls interrupt playback :(
pre 3
- some of the previous features broken again
diff --git a/TOOLS/subfont-c/font.desc.tail b/TOOLS/subfont-c/font.desc.tail
index c1205e9960..fbedc41f71 100644
--- a/TOOLS/subfont-c/font.desc.tail
+++ b/TOOLS/subfont-c/font.desc.tail
@@ -22,7 +22,7 @@
; the alpha to get a smooth black outline of the letters, which
; makes them visible even on white areas of the movie.
;
-; MPlayer needs at least two seperate 8bit/pixel format bitmap
+; MPlayer needs at least two separate 8bit/pixel format bitmap
; files and a .desc file to be able to use the font. One of the
; files is the bitmap the other is the alpha. The .desc (like this
; one) gives MPlayer the information needed to convert a bitmap
diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c
index a25390ec62..f8c9d5ee11 100644
--- a/libmpcodecs/vf_mcdeint.c
+++ b/libmpcodecs/vf_mcdeint.c
@@ -218,7 +218,7 @@ static int config(struct vf_instance_s* vf,
case 1:
avctx_enc->flags |= CODEC_FLAG_4MV;
avctx_enc->dia_size=2;
-// avctx_enc->mb_decision = MB_DECISSION_RD;
+// avctx_enc->mb_decision = MB_DECISION_RD;
case 0:
avctx_enc->flags |= CODEC_FLAG_QPEL;
}
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index 96ae640b04..d2c679b178 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -142,8 +142,8 @@ typedef struct
/**
* \brief Stores persistant variables.
*
- * Variables stored here are kept from frame to frame, and seperate instances of
- * the filter will get their own seperate copies.
+ * Variables stored here are kept from frame to frame, and separate instances of
+ * the filter will get their own separate copies.
*/
typedef struct
{
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index 85d285b51b..290ca18833 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -79,7 +79,7 @@ typedef struct {
} vivo_priv_t;
/* parse all possible extra headers */
-/* (audio headers are seperate - mostly with recordtype=3 or 4) */
+/* (audio headers are separate - mostly with recordtype=3 or 4) */
#define TEXTPARSE_ALL 1
static void vivo_parse_text_header(demuxer_t *demux, int header_len)
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index 817ddbb931..b227eb88f0 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -424,7 +424,7 @@ static int preinit(const char *arg) {
bl_hosts[no_bl_hosts].port);
no_bl_hosts++;
} else {
- mp_msg(MSGT_VO, MSGL_ERR, "bl: syntax error in entry %d in subdevice %s, should be a comma seperated\nlist of host=name:port and file=foo.bml\n", no_bl_hosts, no_bl_files, arg);
+ mp_msg(MSGT_VO, MSGL_ERR, "bl: syntax error in entry %d in subdevice %s, should be a comma separated\nlist of host=name:port and file=foo.bml\n", no_bl_hosts, no_bl_files, arg);
return 1;
}
p = ++q;
diff --git a/subopt-helper.c b/subopt-helper.c
index b0b425eab7..d1a169220f 100644
--- a/subopt-helper.c
+++ b/subopt-helper.c
@@ -108,7 +108,7 @@ int subopt_parse( char const * const str, opt_t * opts )
/* type specific code */
if ( opts[idx].type == OPT_ARG_BOOL )
{
- /* Handle OPT_ARG_BOOL seperately so *
+ /* Handle OPT_ARG_BOOL separately so *
* the others can share code. */
/* set option to true */