diff options
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/bitmap_packer.c | 4 | ||||
-rw-r--r-- | video/out/x11_common.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |