summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--stream/stream_cddb.c15
-rw-r--r--video/csputils.c2
-rw-r--r--video/out/bitmap_packer.c4
-rw-r--r--video/out/x11_common.c2
5 files changed, 12 insertions, 13 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 01406e8a55..30fb91f44e 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -203,7 +203,7 @@ static bool is_parsed_header(struct mkv_demuxer *mkv_d, int64_t pos)
int low = 0;
int high = mkv_d->num_parsed_pos;
while (high > low + 1) {
- int mid = high + low >> 1;
+ int mid = (high + low) >> 1;
if (mkv_d->parsed_pos[mid] > pos)
high = mid;
else
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 7f4558e7e7..5a6ba4e280 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -879,14 +879,13 @@ cd_info_t *cddb_parse_xmcd(char *xmcd_file)
// Ignore comments
if (ptr[0] != '#') {
// Search for the album title
- if (xmcd_parse_dtitle(cd_info, ptr))
- ;
- // Search for the genre
- else if (xmcd_parse_dgenre(cd_info, ptr))
- ;
- // Search for a track title
- else if (xmcd_parse_ttitle(cd_info, ptr))
- ;
+ if (!xmcd_parse_dtitle(cd_info, ptr)) {
+ // Search for the genre
+ if (!xmcd_parse_dgenre(cd_info, ptr)) {
+ // Search for a track title
+ xmcd_parse_ttitle(cd_info, ptr);
+ }
+ }
}
if (ptr2[1] == '\n')
ptr2++;
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<<params->texture_bits)-1.);
+ double s = (1 << (params->input_bits-8)) / ((1<<params->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;
}