From 266230ad64eddb663cfcf12ad248f9ae178d22ba Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 19 May 2013 15:47:34 +0200 Subject: Silence some compiler warnings None of these were actual issues. --- video/csputils.c | 2 +- video/out/bitmap_packer.c | 4 ++-- video/out/x11_common.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'video') diff --git a/video/csputils.c b/video/csputils.c index cc87725d45..240c7a3259 100644 --- a/video/csputils.c +++ b/video/csputils.c @@ -218,7 +218,7 @@ void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float m[3][4]) assert(params->input_bits >= 8); assert(params->texture_bits >= params->input_bits); - double s = (1 << params->input_bits-8) / ((1<texture_bits)-1.); + double s = (1 << (params->input_bits-8)) / ((1<texture_bits)-1.); // The values below are written in 0-255 scale struct yuvlevels { double ymin, ymax, cmin, cmid; } yuvlim = { 16*s, 235*s, 16*s, 128*s }, diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index aae0703072..4fd6594a35 100644 --- a/video/out/bitmap_packer.c +++ b/video/out/bitmap_packer.c @@ -150,9 +150,9 @@ int packer_pack(struct bitmap_packer *packer) xmax = FFMAX(0, xmax - packer->padding); ymax = FFMAX(0, ymax - packer->padding); if (xmax > packer->w) - packer->w = 1 << av_log2(xmax - 1) + 1; + packer->w = 1 << (av_log2(xmax - 1) + 1); if (ymax > packer->h) - packer->h = 1 << av_log2(ymax - 1) + 1; + packer->h = 1 << (av_log2(ymax - 1) + 1); while (1) { int used_width = 0; int y = pack_rectangles(in, packer->result, packer->count, diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 2e5f14f8d1..c5da9ad055 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -1519,7 +1519,7 @@ double vo_x11_vm_get_fps(struct vo *vo) return 1e3 * clock / modeline.htotal / modeline.vtotal; } #else /* CONFIG_XF86VM */ -double vo_vm_get_fps(struct vo *vo) +double vo_x11_vm_get_fps(struct vo *vo) { return 0; } -- cgit v1.2.3