RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Silence some compiler warnings 

None of these were actual issues.
This commit is contained in:
wm4 2013-05-19 15:47:34 +02:00
parent 3b54dce9e5
commit 266230ad64
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux_mkv.c
View File

@ -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

15
stream/stream_cddb.c
View File

@ -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++;

2
video/csputils.c
View File

@ -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 },

4
video/out/bitmap_packer.c
View File

@ -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,

2
video/out/x11_common.c
View File

@ -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;
}