summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/aconverter.c2
-rw-r--r--audio/filter/af_lavcac3enc.c2
-rw-r--r--audio/out/push.c2
-rw-r--r--common/recorder.c2
-rw-r--r--demux/ebml.c4
-rw-r--r--player/loadfile.c6
-rw-r--r--player/video.c2
-rw-r--r--video/out/gpu/lcms.c2
-rw-r--r--video/out/opengl/hwdec_vaegl.c2
9 files changed, 12 insertions, 12 deletions
diff --git a/audio/aconverter.c b/audio/aconverter.c
index a9025278cb..19b8960de2 100644
--- a/audio/aconverter.c
+++ b/audio/aconverter.c
@@ -325,7 +325,7 @@ static bool configure_lavrr(struct mp_aconverter *p, bool verbose)
p->is_resampling = false;
if (avresample_open(p->avrctx) < 0 || avresample_open(p->avrctx_out) < 0) {
- MP_ERR(p, "Cannot open Libavresample Context. \n");
+ MP_ERR(p, "Cannot open Libavresample context.\n");
goto error;
}
return true;
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index 33e685eddb..14aa53b980 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -400,7 +400,7 @@ static int af_open(struct af_instance* af){
}
}
if (i >= 19) {
- MP_WARN(af, "unable set unsupported bitrate %d, use default "
+ MP_WARN(af, "unable set unsupported bitrate %d, using default "
"bitrate (check manpage to see supported bitrates).\n",
s->cfg_bit_rate);
}
diff --git a/audio/out/push.c b/audio/out/push.c
index 1f87481183..b198afef91 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -310,7 +310,7 @@ static void ao_play_data(struct ao *ao)
r = ao->driver->play(ao, (void **)planes, samples, flags);
MP_STATS(ao, "end ao fill");
if (r > samples) {
- MP_ERR(ao, "Audio device returned non-sense value.\n");
+ MP_ERR(ao, "Audio device returned nonsense value.\n");
r = samples;
} else if (r < 0) {
MP_ERR(ao, "Error writing audio to device.\n");
diff --git a/common/recorder.c b/common/recorder.c
index d8f937b902..9970c05c32 100644
--- a/common/recorder.c
+++ b/common/recorder.c
@@ -160,7 +160,7 @@ struct mp_recorder *mp_recorder_create(struct mpv_global *global,
av_dict_set(&priv->mux->metadata, "encoding_tool", version, 0);
if (avformat_write_header(priv->mux, NULL) < 0) {
- MP_ERR(priv, "Write header failed.\n");
+ MP_ERR(priv, "Writing header failed.\n");
goto error;
}
diff --git a/demux/ebml.c b/demux/ebml.c
index d2a8629136..a64c1dd99c 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -478,8 +478,8 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target,
bool multiple = fd->multiple;
int *countptr = (int *) (s + fd->count_offset);
if (*countptr >= num_elems[field_idx]) {
- // Shouldn't happen with on any sane file without bugs
- MP_ERR(ctx, "Too many subelems?\n");
+ // Shouldn't happen on any sane file without bugs
+ MP_ERR(ctx, "Too many subelements.\n");
ctx->has_errors = true;
data += length;
continue;
diff --git a/player/loadfile.c b/player/loadfile.c
index 3551117522..b5c7cae6cb 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -895,7 +895,7 @@ static void open_demux_reentrant(struct MPContext *mpctx)
if (done) {
MP_VERBOSE(mpctx, "Dropping finished prefetch of wrong URL.\n");
} else {
- MP_VERBOSE(mpctx, "Aborting onging prefetch of wrong URL.\n");
+ MP_VERBOSE(mpctx, "Aborting ongoing prefetch of wrong URL.\n");
}
cancel_open(mpctx);
}
@@ -1060,7 +1060,7 @@ static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit)
{
if (mpctx->vo_chain) {
if (mpctx->vo_chain->video_src) {
- MP_ERR(mpctx, "Pad vo tries to connected to already used VO.\n");
+ MP_ERR(mpctx, "Pad vo tries to connect to already used VO.\n");
goto done;
}
} else {
@@ -1080,7 +1080,7 @@ static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit)
{
if (mpctx->ao_chain) {
if (mpctx->ao_chain->audio_src) {
- MP_ERR(mpctx, "Pad ao tries to connected to already used AO.\n");
+ MP_ERR(mpctx, "Pad ao tries to connect to already used AO.\n");
goto done;
}
} else {
diff --git a/player/video.c b/player/video.c
index 956e55d843..75ab78d5ab 100644
--- a/player/video.c
+++ b/player/video.c
@@ -1321,7 +1321,7 @@ void write_video(struct MPContext *mpctx)
osd_set_force_video_pts(mpctx->osd, MP_NOPTS_VALUE);
if (!update_subtitles(mpctx, mpctx->next_frames[0]->pts)) {
- MP_VERBOSE(mpctx, "Video frame delayed due waiting on subtitles.\n");
+ MP_VERBOSE(mpctx, "Video frame delayed due to waiting on subtitles.\n");
return;
}
diff --git a/video/out/gpu/lcms.c b/video/out/gpu/lcms.c
index 8747ae6aa6..3552351219 100644
--- a/video/out/gpu/lcms.c
+++ b/video/out/gpu/lcms.c
@@ -236,7 +236,7 @@ static cmsHPROFILE get_vid_profile(struct gl_lcms *p, cmsContext cms,
}
// Otherwise, warn the user and generate the profile as usual
- MP_WARN(p, "Video contained an invalid ICC profile! Ignoring..\n");
+ MP_WARN(p, "Video contained an invalid ICC profile! Ignoring...\n");
}
// The input profile for the transformation is dependent on the video
diff --git a/video/out/opengl/hwdec_vaegl.c b/video/out/opengl/hwdec_vaegl.c
index 597b81a2b5..b4587c5eb9 100644
--- a/video/out/opengl/hwdec_vaegl.c
+++ b/video/out/opengl/hwdec_vaegl.c
@@ -497,7 +497,7 @@ static void determine_working_formats(struct ra_hwdec *hw)
AVHWFramesConstraints *fc =
av_hwdevice_get_hwframe_constraints(p->ctx->av_device_ref, NULL);
if (!fc) {
- MP_WARN(hw, "failed to retrieve libavutil frame constaints\n");
+ MP_WARN(hw, "failed to retrieve libavutil frame constraints\n");
goto done;
}
for (int n = 0; fc->valid_sw_formats[n] != AV_PIX_FMT_NONE; n++) {