From a28e2a7432f68e4a5db96cce8cbaa859327c4527 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Jun 2014 23:30:16 +0200 Subject: video: correct spelling: mp_image_params_equals -> mp_image_params_equal The type is struct mp_image_params, so the "params" should have a "s". "equals" shouldn't, because it's plural for 2 params. Important. --- player/video.c | 4 ++-- video/filter/vf.c | 6 +++--- video/mp_image.c | 4 ++-- video/mp_image.h | 4 ++-- video/out/gl_video.c | 2 +- video/out/vo.c | 2 +- video/sws_utils.c | 4 ++-- video/vdpau_mixer.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/player/video.c b/player/video.c index 59484088d6..c7d5cd8ddb 100644 --- a/player/video.c +++ b/player/video.c @@ -367,7 +367,7 @@ static int video_decode_and_filter(struct MPContext *mpctx) // Decoder output is different from filter input? bool need_vf_reconfig = !vf->input_params.imgfmt || vf->initialized < 1 || - !mp_image_params_equals(&d_video->decoder_output, &vf->input_params); + !mp_image_params_equal(&d_video->decoder_output, &vf->input_params); // (If imgfmt==0, nothing was decoded yet, and the format is unknown.) if (need_vf_reconfig && d_video->decoder_output.imgfmt) { @@ -465,7 +465,7 @@ static int video_output_image(struct MPContext *mpctx, double endpts, // Filter output is different from VO input? bool need_vo_reconfig = !vo->params || - !mp_image_params_equals(&vf->output_params, vo->params); + !mp_image_params_equal(&vf->output_params, vo->params); if (need_vo_reconfig) { // Draining VO buffers. diff --git a/video/filter/vf.c b/video/filter/vf.c index 0d3f5094e5..f187f7f2bd 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -387,7 +387,7 @@ static int vf_do_filter(struct vf_instance *vf, struct mp_image *img) { assert(vf->fmt_in.imgfmt); if (img) - assert(mp_image_params_equals(&img->params, &vf->fmt_in)); + assert(mp_image_params_equal(&img->params, &vf->fmt_in)); if (vf->filter_ext) { int r = vf->filter_ext(vf, img); @@ -413,7 +413,7 @@ int vf_filter_frame(struct vf_chain *c, struct mp_image *img) talloc_free(img); return -1; } - assert(mp_image_params_equals(&img->params, &c->input_params)); + assert(mp_image_params_equal(&img->params, &c->input_params)); vf_fix_img_params(img, &c->override_params); return vf_do_filter(c->first, img); } @@ -580,7 +580,7 @@ static int vf_reconfig_wrapper(struct vf_instance *vf, r = 0; } - if (!mp_image_params_equals(&vf->fmt_in, p)) + if (!mp_image_params_equal(&vf->fmt_in, p)) r = -2; if (!mp_image_params_valid(&vf->fmt_out)) diff --git a/video/mp_image.c b/video/mp_image.c index 76d6c1ab97..85638e9fd1 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -477,8 +477,8 @@ bool mp_image_params_valid(const struct mp_image_params *p) return true; } -bool mp_image_params_equals(const struct mp_image_params *p1, - const struct mp_image_params *p2) +bool mp_image_params_equal(const struct mp_image_params *p1, + const struct mp_image_params *p2) { return p1->imgfmt == p2->imgfmt && p1->w == p2->w && p1->h == p2->h && diff --git a/video/mp_image.h b/video/mp_image.h index 8419da8e3c..61a3d50f53 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -140,8 +140,8 @@ struct mp_image *mp_image_new_external_ref(struct mp_image *img, void *arg, void mp_image_params_guess_csp(struct mp_image_params *params); bool mp_image_params_valid(const struct mp_image_params *p); -bool mp_image_params_equals(const struct mp_image_params *p1, - const struct mp_image_params *p2); +bool mp_image_params_equal(const struct mp_image_params *p1, + const struct mp_image_params *p2); void mp_image_set_params(struct mp_image *image, const struct mp_image_params *params); diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 832f39cfe0..2a24c073e5 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -2196,7 +2196,7 @@ void gl_video_config(struct gl_video *p, struct mp_image_params *params) p->have_image = false; mp_image_unrefp(&p->image.hwimage); - if (!mp_image_params_equals(&p->image_params, params)) { + if (!mp_image_params_equal(&p->image_params, params)) { uninit_video(p); init_video(p, params); } diff --git a/video/out/vo.c b/video/out/vo.c index b41f281aad..cbf06a98df 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -286,7 +286,7 @@ void vo_queue_image(struct vo *vo, struct mp_image *mpi) assert(mpi); if (!vo->config_ok) return; - assert(mp_image_params_equals(vo->params, &mpi->params)); + assert(mp_image_params_equal(vo->params, &mpi->params)); if (vo->driver->filter_image && mpi) mpi = vo->driver->filter_image(vo, mpi); if (!mpi) { diff --git a/video/sws_utils.c b/video/sws_utils.c index 46571c018d..a7fcc0469c 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -119,8 +119,8 @@ static bool cache_valid(struct mp_sws_context *ctx) struct mp_sws_context *old = ctx->cached; if (ctx->force_reload) return false; - return mp_image_params_equals(&ctx->src, &old->src) && - mp_image_params_equals(&ctx->dst, &old->dst) && + return mp_image_params_equal(&ctx->src, &old->src) && + mp_image_params_equal(&ctx->dst, &old->dst) && ctx->flags == old->flags && ctx->brightness == old->brightness && ctx->contrast == old->contrast && diff --git a/video/vdpau_mixer.c b/video/vdpau_mixer.c index 2d60f32912..88509ea833 100644 --- a/video/vdpau_mixer.c +++ b/video/vdpau_mixer.c @@ -234,7 +234,7 @@ int mp_vdpau_mixer_render(struct mp_vdpau_mixer *mixer, mixer->initialized = false; if (!mixer->initialized || !opts_equal(opts, &mixer->opts) || - !mp_image_params_equals(&video->params, &mixer->image_params)) + !mp_image_params_equal(&video->params, &mixer->image_params)) { mixer->opts = *opts; mixer->image_params = video->params; -- cgit v1.2.3