summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DOCS/tech-overview.txt2
-rw-r--r--audio/filter/af.c2
-rw-r--r--audio/out/ao_wasapi.c2
-rw-r--r--audio/out/ao_wasapi_changenotify.c2
-rw-r--r--misc/bstr.h2
-rw-r--r--options/m_option.h2
-rw-r--r--osdep/ar/HIDRemote.h4
-rw-r--r--osdep/ar/HIDRemote.m6
-rw-r--r--stream/tvi_v4l2.c2
-rw-r--r--video/decode/d3d.c2
-rw-r--r--video/gpu_memcpy.c2
-rw-r--r--video/out/opengl/video.c2
-rw-r--r--video/out/vo_direct3d.c2
-rw-r--r--video/out/w32_common.c2
14 files changed, 17 insertions, 17 deletions
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt
index 914b2222b4..e53f00b7be 100644
--- a/DOCS/tech-overview.txt
+++ b/DOCS/tech-overview.txt
@@ -123,7 +123,7 @@ options/options.h, options/options.c
parser-mpcmd.c, and uses the option table in options.c.
input/input.c:
- This translates keyboard input comming from VOs and other sources (such
+ This translates keyboard input coming from VOs and other sources (such
as remote control devices like Apple IR or client API commands) to the
key bindings listed in the user's (or the builtin) input.conf and turns
them into items of type struct mp_cmd. These commands are queued, and read
diff --git a/audio/filter/af.c b/audio/filter/af.c
index ac1b4926d8..084589873f 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -557,7 +557,7 @@ void af_destroy(struct af_stream *s)
format of the preferred output respectively. The function is
reentrant i.e. if called with an already initialized stream the
stream will be reinitialized.
- If one of the prefered output parameters is 0 the one that needs
+ If one of the preferred output parameters is 0 the one that needs
no conversion is used (i.e. the output format in the last filter).
The return value is 0 if success and -1 if failure */
int af_init(struct af_stream *s)
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index ae6bd3d9dc..325a7cf72b 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -132,7 +132,7 @@ static bool thread_feed(struct ao *ao)
mp_time_us() + (int64_t)llrint(delay_us));
// note, we can't use ao_read_data return value here since we already
- // commited to frame_count above in the GetBuffer call
+ // committed to frame_count above in the GetBuffer call
hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient,
frame_count, 0);
EXIT_ON_ERROR(hr);
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c
index e3ca4e4936..46843ec5e3 100644
--- a/audio/out/ao_wasapi_changenotify.c
+++ b/audio/out/ao_wasapi_changenotify.c
@@ -95,7 +95,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceAdded(
return S_OK;
}
-// maybe MPV can go over to the prefered device once it is plugged in?
+// maybe MPV can go over to the preferred device once it is plugged in?
static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved(
IMMNotificationClient *This,
LPCWSTR pwstrDeviceId)
diff --git a/misc/bstr.h b/misc/bstr.h
index 2785520b87..4aba35e965 100644
--- a/misc/bstr.h
+++ b/misc/bstr.h
@@ -116,7 +116,7 @@ int bstr_validate_utf8(struct bstr s);
// talloc, with talloc_ctx as parent.
struct bstr bstr_sanitize_utf8_latin1(void *talloc_ctx, struct bstr s);
-// Return the text before the occurance of a character, and return it. Change
+// Return the text before the occurrence of a character, and return it. Change
// *rest to point to the text following this character. (rest can be NULL.)
struct bstr bstr_splitchar(struct bstr str, struct bstr *rest, const char c);
diff --git a/options/m_option.h b/options/m_option.h
index 7e6550691a..4066a36d81 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -394,7 +394,7 @@ struct m_option {
// Dynamic data type.
/** This flag indicates that the data is dynamically allocated (m_option::p
- * points to a pointer). It enables a little hack in the \ref Config wich
+ * points to a pointer). It enables a little hack in the \ref Config which
* replaces the initial value of such variables with a dynamic copy in case
* the initial value is statically allocated (pretty common with strings).
*/
diff --git a/osdep/ar/HIDRemote.h b/osdep/ar/HIDRemote.h
index 9ea01d1fc2..35db408b40 100644
--- a/osdep/ar/HIDRemote.h
+++ b/osdep/ar/HIDRemote.h
@@ -74,7 +74,7 @@
typedef enum
{
kHIDRemoteModeNone = 0L,
- kHIDRemoteModeShared, // Share the remote with others - let's you listen to the remote control events as long as noone has an exclusive lock on it
+ kHIDRemoteModeShared, // Share the remote with others - let's you listen to the remote control events as long as no one has an exclusive lock on it
// (RECOMMENDED ONLY FOR SPECIAL PURPOSES)
kHIDRemoteModeExclusive, // Try to acquire an exclusive lock on the remote (NOT RECOMMENDED)
@@ -182,7 +182,7 @@ typedef enum
- (BOOL)hidRemote:(HIDRemote *)hidRemote // Invoked when new hardware is inspected
inspectNewHardwareWithService:(io_service_t)service //
prematchResult:(BOOL)prematchResult; // Return YES if HIDRemote should go on with this hardware and try
- // to use it, or NO if it should not be persued further.
+ // to use it, or NO if it should not be pursued further.
// Exlusive lock lending
- (BOOL)hidRemote:(HIDRemote *)hidRemote
diff --git a/osdep/ar/HIDRemote.m b/osdep/ar/HIDRemote.m
index f62289e23c..47e35f46fd 100644
--- a/osdep/ar/HIDRemote.m
+++ b/osdep/ar/HIDRemote.m
@@ -293,7 +293,7 @@ static HIDRemote *sHIDRemote = nil;
}while(0);
- // An error occured. Do necessary clean up.
+ // An error occurred. Do necessary clean up.
if (matchDict!=NULL)
{
CFRelease(matchDict);
@@ -1422,7 +1422,7 @@ static HIDRemote *sHIDRemote = nil;
[((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self failedNewHardwareWithError:error];
}
- // An error occured or this device is not of interest .. cleanup ..
+ // An error occurred or this device is not of interest .. cleanup ..
if (serviceNotification!=0)
{
IOObjectRelease(serviceNotification);
@@ -1615,7 +1615,7 @@ static HIDRemote *sHIDRemote = nil;
switch (buttonCode)
{
case kHIDRemoteButtonCodeIDChanged:
- // Do nothing, this is handled seperately
+ // Do nothing, this is handled separately
break;
case kHIDRemoteButtonCodeUp:
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index f882818a59..91c810ad23 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -1352,7 +1352,7 @@ static int start(priv_t *priv)
if (priv->map[i].buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC)
MP_WARN(priv, "compiled without clock_gettime() that is needed to handle monotone video timestamps from the kernel. Expect desync.\n");
#endif
- /* count up to make sure this is correct everytime */
+ /* count up to make sure this is correct every time */
priv->mapcount++;
if (v4l2_ioctl(priv->video_fd, VIDIOC_QBUF, &(priv->map[i].buf)) < 0) {
diff --git a/video/decode/d3d.c b/video/decode/d3d.c
index b978472723..59d2a81664 100644
--- a/video/decode/d3d.c
+++ b/video/decode/d3d.c
@@ -68,7 +68,7 @@ struct d3dva_mode {
#define MODE2(id) &MP_CONCAT(DXVA2_Mode, id), # id
#define MODE(id) &MP_CONCAT(DXVA_, id), # id
-// Prefered modes must come first
+// Preferred modes must come first
static const struct d3dva_mode d3dva_modes[] = {
// MPEG-1/2
{MODE2(MPEG2_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN},
diff --git a/video/gpu_memcpy.c b/video/gpu_memcpy.c
index 355da0e2a2..542fbc8b50 100644
--- a/video/gpu_memcpy.c
+++ b/video/gpu_memcpy.c
@@ -83,7 +83,7 @@ void *gpu_memcpy(void *restrict d, const void *restrict s, size_t size)
xmm15 = _mm_stream_load_si128(pSrc + 15);
#endif
pSrc += regsInLoop;
- // _mm_store_si128 emit the SSE2 intruction MOVDQA (aligned store)
+ // _mm_store_si128 emit the SSE2 instruction MOVDQA (aligned store)
_mm_store_si128(pTrg , xmm0);
_mm_store_si128(pTrg + 1, xmm1);
_mm_store_si128(pTrg + 2, xmm2);
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index f46fdc1c9f..4387208ead 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -2564,7 +2564,7 @@ static void gl_video_interpolate_frame(struct gl_video *p, struct vo_frame *t,
if (t->still)
gl_video_reset_surfaces(p);
- // First of all, figure out if we have a frame availble at all, and draw
+ // First of all, figure out if we have a frame available at all, and draw
// it manually + reset the queue if not
if (p->surfaces[p->surface_now].pts == MP_NOPTS_VALUE) {
if (!gl_video_upload_image(p, t->current))
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 5190095621..ed7b1dd62a 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -822,7 +822,7 @@ static bool resize_d3d(d3d_priv *priv)
MP_VERBOSE(priv, "resize_d3d %dx%d called.\n",
priv->vo->dwidth, priv->vo->dheight);
- /* Make sure that backbuffer is large enough to accomodate the new
+ /* Make sure that backbuffer is large enough to accommodate the new
viewport dimensions. Grow it if necessary. */
bool backbuf_resize = priv->vo->dwidth > priv->cur_backbuf_width ||
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index f3b59f183f..c29fc51dc8 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -1182,7 +1182,7 @@ static void gui_thread_reconfig(void *ptr)
}
// Recenter window around old position on new video size
- // excluding the case when initial positon handled by win_state.
+ // excluding the case when initial position handled by win_state.
if (!pos_init) {
w32->window_x += w32->dw / 2 - vo->dwidth / 2;
w32->window_y += w32->dh / 2 - vo->dheight / 2;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 17:48:57 +0000