various: fix typos

.github/ISSUE_TEMPLATE/2_bug_report_linux.yml

@@ -26,7 +26,7 @@ body:
   attributes:
       label: "Other Information"
       description: >
-          Provide follwing information if applicable.
+          Provide following information if applicable.
            - Linux Version: `cat /etc/os-release | grep "NAME"`
            - Kernel Version: `uname -a`
            - GPU Model: `lspci -nn | grep VGA` or `lshw -C display -numeric`

.github/ISSUE_TEMPLATE/2_bug_report_windows.yml

@@ -93,7 +93,7 @@ body:
           save the terminal output to a file, and attach it to the issue.
 
 
-          In the case of a crash, please provide a backtrace, attach the approriate `.dmp` file
+          In the case of a crash, please provide a backtrace, attach the appropriate `.dmp` file
           from `%LOCALAPPDATA%\CrashDumps`.
 
 

DOCS/client-api-changes.rst

@@ -57,7 +57,7 @@ API changes
           TRACK_SWITCHED, METADATA_UPDATE, CHAPTER_CHANGE events
  --- mpv 0.33.0 ---
  1.109  - add MPV_RENDER_API_TYPE_SW and related (software rendering API)
-        - inactivate the opengl_cb API (always fails to initialize now)
+        - deactivate the opengl_cb API (always fails to initialize now)
           The opengl_cb API was deprecated over 2 years ago. Use the render API
           instead.
  1.108  - Deprecate MPV_EVENT_IDLE

DOCS/interface-changes.rst

@@ -314,12 +314,12 @@ Interface changes
     - `--save-position-on-quit` and its associated commands now store state files in
       the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
       systems.
-    - mpv now implictly saves cache files in XDG_CACHE_HOME by default. This only has
+    - mpv now implicitly saves cache files in XDG_CACHE_HOME by default. This only has
       an effect if the user enables options that would lead to cache being stored and
       only makes a difference on linux/bsd systems.
-    - `--cache-on-disk` no longer requires explictly setting the `--cache-dir` option
+    - `--cache-on-disk` no longer requires explicitly setting the `--cache-dir` option
     - add `--icc-cache` and `--gpu-shader-cache` options to control whether or not to
-      save cache files for these features; explictly setting `--icc-cache-dir` and
+      save cache files for these features; explicitly setting `--icc-cache-dir` and
       `--gpu-shader-cache` is no longer required
     - remove the `--tone-mapping-crosstalk` option
     - add `--gamut-mapping-mode=perceptual|relative|saturation|absolute|linear`
@@ -461,7 +461,7 @@ Interface changes
     - deprecate --input-file (there are no plans to remove this short-term,
       but it will probably eventually go away <- that was a lie)
     - deprecate --video-sync=display-adrop (might be removed if it's in the way;
-      undeprecated or readded if it's not too much of a problem)
+      undeprecated or re-added if it's not too much of a problem)
     - deprecate all input section commands (these will be changed/removed, as
       soon as mpv internals do not require them anymore)
     - remove deprecated --playlist-pos alias (use --playlist-start)

DOCS/man/options.rst

@@ -573,8 +573,8 @@ Playback Control
 
     Known problems:
 
-    - It's fragile. If anything doesn't work, random non-useful behavior may
-      occur. In simple cases, the player will just play nonsense and artifacts.
+    - It's fragile. If anything doesn't work, random behavior may occur.
+      In simple cases, the player will just play nonsense and artifacts.
       In other cases, it may get stuck or heat the CPU. (Exceeding memory usage
       significantly beyond the user-set limits would be a bug, though.)
 
@@ -988,7 +988,7 @@ Program Behavior
         Add thumbnails as video tracks (default: none).
 
         Thumbnails get downloaded when they are added as tracks, so 'all' can
-        have a noticable impact on how long it takes to open the video when
+        have a noticeable impact on how long it takes to open the video when
         there are a lot of thumbnails.
 
     ``use_manifests=<yes|no>``
@@ -2315,7 +2315,7 @@ Audio
             directories.
 
 ``--audio-exts=ext1,ext2,...``
-    Audio file extentions to try to match when using ``--audio-file-auto``,
+    Audio file extensions to try to match when using ``--audio-file-auto``,
     ``--autocreate-playlist`` or ``--directory-filter-types``.
 
     This is a string list option. See `List Options`_ for details.
@@ -2714,7 +2714,7 @@ Subtitles
     (default: no). Normally, the subtitle canvas is fit into the video canvas
     (e.g. letterboxed). Setting this option uses the video size as subtitle
     canvas size. Can be useful to test broken subtitles, which often happen
-    when the video was trancoded, while attempting to keep the old subtitles.
+    when the video was transcoded, while attempting to keep the old subtitles.
 
 ``--sub-ass=<yes|no>``
     Render ASS subtitles natively (default: yes).
@@ -2748,7 +2748,7 @@ Subtitles
     :all:   Load all subs in the current and ``--sub-file-paths`` directories.
 
 ``--sub-auto-exts=ext1,ext2,...``
-    Subtitle extentions to try and match when using ``--sub-auto``. Note that
+    Subtitle extensions to try and match when using ``--sub-auto``. Note that
     modifying this list will also affect what mpv recognizes as subtitles when
     using drag and drop.
 
@@ -3355,7 +3355,7 @@ Window
 
 ``--ontop-level=<window|system|desktop|level>``
     (macOS only)
-    Sets the level of an ontop window (default: window).
+    Sets the level of an on-top window (default: window).
 
     :window:  On top of all other windows.
     :system:  On top of system elements like Taskbar, Menubar and Dock.
@@ -7710,7 +7710,7 @@ Miscellaneous
     used to disable cover art that is part of the file).
 
 ``--image-exts=ext1,ext2,...``
-    Image file extentions to try to match when using ``--cover-art-auto``,
+    Image file extensions to try to match when using ``--cover-art-auto``,
     ``--autocreate-playlist`` or ``--directory-filter-types``.
 
     This is a string list option. See `List Options`_ for details.
@@ -7726,21 +7726,21 @@ Miscellaneous
     This is a string list option. See `List Options`_ for details.
 
 ``--video-exts=ext1,ext2,...``
-    Video file extentions to try to match when using ``--autocreate-playlist`` or
+    Video file extensions to try to match when using ``--autocreate-playlist`` or
     ``--directory-filter-types``.
 
     This is a string list option. See `List Options`_ for details.
     Use ``--help=video-exts`` to see default extensions.
 
 ``--archive-exts=ext1,ext2,...``
-    Archive file extentions to try to match when using ``--autocreate-playlist``
+    Archive file extensions to try to match when using ``--autocreate-playlist``
     or ``--directory-filter-types``.
 
     This is a string list option. See `List Options`_ for details. Use
     ``--help=archive-exts`` to see the default extensions.
 
 ``--playlist-exts=ext1,ext2,...``
-    Playlist file extentions to try to match when using
+    Playlist file extensions to try to match when using
     ``--autocreate-playlist`` or ``--directory-filter-types``.
 
     This is a string list option. See `List Options`_ for details. Use

DOCS/release-policy.md

@@ -43,7 +43,7 @@ While on master:
 - Create a new GitHub release using the content of `RELEASE_NOTES` related to
   the new version.
 
-- Readd -UNKNOWN suffix to version in `MPV_VERSION` file.
+- Re-add -UNKNOWN suffix to version in `MPV_VERSION` file.
 
 If necessary (to e.g. exclude commits already on master), the release can
 be done on a branch with different commit history. The release branch **must**

TOOLS/dylib_unhell.py

@@ -258,7 +258,7 @@ def process_vulkan_loader(binary, loader_name, loader_relative_folder, library_n
         print(">>> could not find loader library " + library_system_path)
         return
 
-    print(">>> modifiying and writing loader json " + loader_name)
+    print(">>> modifying and writing loader json " + loader_name)
     loader_bundle_file = open(loader_bundle_path, "w")
     loader_library_name = os.path.basename(library_system_path)
     library_path = os.path.join(library_relative_folder, loader_library_name)

TOOLS/lua/autoload.lua

@@ -332,7 +332,7 @@ local function find_and_add_entries()
         extensions = EXTENSIONS
     end
     if not extensions then
-        msg.debug("stopping: no matched extentions list")
+        msg.debug("stopping: no matched extensions list")
         return
     end
 

audio/decode/ad_lavc.c

@@ -200,7 +200,7 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)
     if (ret == AVERROR_EOF) {
         // If flushing was initialized earlier and has ended now, make it start
         // over in case we get new packets at some point in the future.
-        // (Dont' reset the filter itself, we want to keep other state.)
+        // (Don't reset the filter itself, we want to keep other state.)
         avcodec_flush_buffers(priv->avctx);
         return ret;
     } else if (ret < 0 && ret != AVERROR(EAGAIN)) {

audio/out/ao_coreaudio_exclusive.c

@@ -232,7 +232,7 @@ static int select_stream(struct ao *ao)
     talloc_free(streams);
 
     if (p->stream_idx < 0) {
-        MP_ERR(ao, "No useable substream found.\n");
+        MP_ERR(ao, "No usable substream found.\n");
         goto coreaudio_error;
     }
 

ci/build-freebsd.sh

@@ -7,7 +7,7 @@ export CFLAGS="$CFLAGS -isystem/usr/local/include -march=native"
 export CXXFLAGS="$CXXFLAGS -isystem/usr/local/include"
 export LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
-# TODO: readd -Ddvbin=enabled
+# TODO: re-add -Ddvbin=enabled
 
 meson setup build $common_args \
   -Db_sanitize=address,undefined \

common/playlist.c

@@ -61,7 +61,7 @@ static void playlist_update_indexes(struct playlist *pl, int start, int end)
 }
 
 // Inserts the entry so that it takes "at"'s place, shifting "at" and all
-// further entires to the right (or append to end, if at==NULL).
+// further entries to the right (or append to end, if at==NULL).
 void playlist_insert_at(struct playlist *pl, struct playlist_entry *add,
                         struct playlist_entry *at)
 {

demux/demux.c

@@ -272,7 +272,7 @@ struct demux_internal {
     // -- Access from demuxer thread only
     bool enable_recording;
     struct mp_recorder *recorder;
-    int64_t slave_unbuffered_read_bytes; // value repoted from demuxer impl.
+    int64_t slave_unbuffered_read_bytes; // value reported from demuxer impl.
     int64_t hack_unbuffered_read_bytes;  // for demux_get_bytes_read_hack()
     int64_t cache_unbuffered_read_bytes; // for demux_reader_state.bytes_per_second
     int64_t byte_level_seeks;            // for demux_reader_state.byte_level_seeks

demux/demux_mkv.c

@@ -584,7 +584,7 @@ static void parse_trackcolour(struct demuxer *demuxer, struct mkv_track *track,
 {
     // Note: As per matroska spec, the order is consistent with ISO/IEC
     // 23001-8:2013/DCOR1, which is the same order used by libavutil/pixfmt.h,
-    // so we can just re-use our avcol_ conversion functions.
+    // so we can just reuse our avcol_ conversion functions.
     if (colour->n_matrix_coefficients) {
         track->repr.sys = pl_system_from_av(colour->matrix_coefficients);
         MP_DBG(demuxer, "|    + Matrix: %s\n",

demux/stheader.h

@@ -119,7 +119,7 @@ struct mp_codec_params {
     int rotate;           // intended display rotation, in degrees, [0, 359]
     int stereo_mode;      // mp_stereo3d_mode (0 if none/unknown)
     struct pl_color_space color; // colorspace info where available
-    struct pl_color_repr repr;   // color representaion info where available
+    struct pl_color_repr repr;   // color representation info where available
     struct mp_rect crop;         // crop to be applied
 
     bool dovi;

filters/f_autoconvert.h

@@ -77,7 +77,7 @@ void mp_autoconvert_add_srate(struct mp_autoconvert *c, int rate);
 
 // Reset set of allowed formats back to initial state. (This does not flush
 // any frames or remove currently active filters, although to get reasonable
-// behavior, you need to readd all previously allowed formats, or reset the
+// behavior, you need to re-add all previously allowed formats, or reset the
 // filter.)
 void mp_autoconvert_clear(struct mp_autoconvert *c);
 

fuzzers/fuzzer_loadfile_direct.c

@@ -29,7 +29,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     if (size <= 1 || data[size - 1] != '\0')
         return 0;
 
-    // Exlude data with null bytes inside
+    // Exclude data with null bytes inside
     if (strlen(data) != size - 1)
         return 0;
 

input/input.c

@@ -777,7 +777,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
         return;
     }
     double now = mp_time_sec();
-    // ignore system doubleclick if we generate these events ourselves
+    // ignore system double-click if we generate these events ourselves
     if (!force_mouse && opts->doubleclick_time && MP_KEY_IS_MOUSE_BTN_DBL(unmod))
         return;
     int units = 1;
@@ -796,7 +796,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
         } else if (code == MP_MBTN_LEFT && ictx->opts->allow_win_drag &&
                    !test_mouse(ictx, ictx->mouse_vo_x, ictx->mouse_vo_y, MP_INPUT_ALLOW_VO_DRAGGING))
         {
-            // This is a mouse left button down event which isn't part of a doubleclick,
+            // This is a mouse left button down event which isn't part of a double-click,
             // and the mouse is on an input section which allows VO dragging.
             // Mark the dragging mouse button down in this case.
             ictx->dragging_button_down = true;
@@ -810,7 +810,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
     if (code & MP_KEY_STATE_UP) {
         code &= ~MP_KEY_STATE_UP;
         if (code == MP_MBTN_LEFT) {
-            // This is a mouse left botton up event. Mark the dragging mouse button up.
+            // This is a mouse left button up event. Mark the dragging mouse button up.
             ictx->dragging_button_down = false;
         }
     }

osdep/mac/app_hub.swift

@@ -100,7 +100,7 @@ class AppHub: NSObject {
 
     @objc func stopRemote() {
 #if HAVE_MACOS_MEDIA_PLAYER
-        log.verbose("Stoping RemoteCommandCenter")
+        log.verbose("Stopping RemoteCommandCenter")
         remote?.stop()
 #endif
     }

osdep/timer.h

@@ -27,7 +27,7 @@ void mp_time_init(void);
 // Return time in nanoseconds. Never wraps. Never returns negative values.
 int64_t mp_time_ns(void);
 
-// Return time in nanoseconds. Coverts raw time in nanoseconds to mp time, subtracts init offset.
+// Return time in nanoseconds. Converts raw time in nanoseconds to mp time, subtracts init offset.
 int64_t mp_time_ns_from_raw_time(uint64_t raw_time);
 
 // Return time in seconds. Can have down to 1 nanosecond resolution, but will
@@ -43,7 +43,7 @@ uint64_t mp_raw_time_ns(void);
 void mp_sleep_ns(int64_t ns);
 
 #if HAVE_DARWIN
-// Coverts mach time to raw time in nanoseconds and returns it.
+// Converts mach time to raw time in nanoseconds and returns it.
 uint64_t mp_raw_time_ns_from_mach(uint64_t mach_time);
 #endif
 

player/command.c

@@ -4555,18 +4555,18 @@ int mp_property_do(const char *name, int action, void *val,
     int r = m_property_do(ctx->log, cmd->properties, name, action, val, ctx);
 
     if (mp_msg_test(ctx->log, MSGL_V) && is_property_set(action, val)) {
-        struct m_option ot = {0};
+        struct m_option option_type = {0};
         void *data = val;
         switch (action) {
         case M_PROPERTY_SET_NODE:
-            ot.type = &m_option_type_node;
+            option_type.type = &m_option_type_node;
             break;
         case M_PROPERTY_SET_STRING:
-            ot.type = &m_option_type_string;
+            option_type.type = &m_option_type_string;
             data = &val;
             break;
         }
-        char *t = ot.type ? m_option_print(&ot, data) : NULL;
+        char *t = option_type.type ? m_option_print(&option_type, data) : NULL;
         MP_VERBOSE(ctx, "Set property: %s%s%s -> %d\n",
                    name, t ? "=" : "", t ? t : "", r);
         talloc_free(t);

player/lua/auto_profiles.lua

@@ -13,7 +13,7 @@ local pending_hooks = {}            -- as set (keys only, meaningless values)
 -- profile the condition is evaluated for.
 local current_profile = nil
 
--- Cached set of all top-level mpv properities. Only used for extra validation.
+-- Cached set of all top-level mpv properties. Only used for extra validation.
 local property_set = {}
 for _, property in pairs(mp.get_property_native("property-list")) do
     property_set[property] = true

player/lua/console.lua

@@ -1838,7 +1838,7 @@ mp.register_script_message('get-input', function (script_name, args)
 end)
 
 mp.register_script_message('log', function (message)
-    -- input.get's edited handler is invoked after submit, so avoid modifying
+    -- input.get edited handler is invoked after submit, so avoid modifying
     -- the default log.
     if input_caller == nil then
         return

player/lua/fzy.lua

@@ -150,7 +150,7 @@ end
 -- Compute a matching score.
 --
 -- Args:
---   needle (string): must be a subequence of `haystack`, or the result is
+--   needle (string): must be a subsequence of `haystack`, or the result is
 --     undefined.
 --   haystack (string)
 --   case_sensitive (bool, optional): defaults to false
@@ -180,7 +180,7 @@ end
 -- in the optimal match.
 --
 -- Args:
---   needle (string): must be a subequence of `haystack`, or the result is
+--   needle (string): must be a subsequence of `haystack`, or the result is
 --     undefined.
 --   haystack (string)
 --   case_sensitive (bool, optional): defaults to false
@@ -289,7 +289,7 @@ function fzy.get_score_ceiling()
   return MATCH_MAX_LENGTH * SCORE_MATCH_CONSECUTIVE
 end
 
--- The name of the currently-running implmenetation, "lua" or "native".
+-- The name of the currently-running implementation, "lua" or "native".
 function fzy.get_implementation_name()
   return "lua"
 end

player/lua/ytdl_hook.lua

@@ -35,14 +35,6 @@ local function Set (t)
     return set
 end
 
--- ?: surrogate (keep in mind that there is no lazy evaluation)
-local function iif(cond, if_true, if_false)
-    if cond then
-        return if_true
-    end
-    return if_false
-end
-
 -- youtube-dl JSON name to mpv tag name
 local tag_list = {
     ["artist"]          = "artist",
@@ -611,7 +603,7 @@ local function formats_to_edl(json, formats, use_all_formats)
                 end
                 hdr[#hdr + 1] = "!track_meta,title=" ..
                     edl_escape(title) .. ",byterate=" .. byterate ..
-                    iif(#flags > 0, ",flags=" .. table.concat(flags, "+"), "")
+                    (#flags > 0 and ",flags=" .. table.concat(flags, "+") or "")
             end
 
             if duration > 0 then