mirror of
https://github.com/mpv-player/mpv
synced 2025-03-19 18:05:21 +00:00
cleanup: silence most of the clang warnings
This commit is contained in:
parent
6794bca0e9
commit
2174cbfa2f
@ -529,11 +529,11 @@ const m_option_t common_opts[] = {
|
||||
|
||||
OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0),
|
||||
|
||||
{ "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{ "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{ "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{ "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
|
||||
#ifdef CONFIG_CDDA
|
||||
{ "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{ "cdda", (void *)&cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#endif
|
||||
|
||||
// demuxer.c - select audio/sub file/demuxer
|
||||
|
@ -646,7 +646,7 @@ static const m_option_t input_conf[] = {
|
||||
};
|
||||
|
||||
static const m_option_t mp_input_opts[] = {
|
||||
{ "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{ "input", (void *)&input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
OPT_MAKE_FLAGS("joystick", input.use_joystick, CONF_GLOBAL),
|
||||
OPT_MAKE_FLAGS("lirc", input.use_lirc, CONF_GLOBAL),
|
||||
OPT_MAKE_FLAGS("lircc", input.use_lircc, CONF_GLOBAL),
|
||||
@ -1487,7 +1487,7 @@ int mp_input_get_key_from_name(const char *name)
|
||||
{
|
||||
int modifiers = 0;
|
||||
const char *p;
|
||||
while (p = strchr(name, '+')) {
|
||||
while ((p = strchr(name, '+'))) {
|
||||
for (struct mp_key_name *m = modifier_names; m->name; m++)
|
||||
if (!bstrcasecmp(BSTR(m->name), (struct bstr){(char *)name, p - name})) {
|
||||
modifiers |= m->key;
|
||||
|
@ -123,7 +123,7 @@ char* af_fmt2str(int format, char* str, int size)
|
||||
case(AF_FORMAT_IMA_ADPCM):
|
||||
i+=snprintf(&str[i],size-i,"IMA-ADPCM "); break;
|
||||
default:
|
||||
i+=snprintf(&str[i],size-i,mp_gtext("unknown format "));
|
||||
i+=snprintf(&str[i],size-i,"%s",mp_gtext("unknown format "));
|
||||
}
|
||||
}
|
||||
else{
|
||||
|
@ -468,8 +468,8 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
|
||||
rlen = read_varlen(&p, segtype, 0);
|
||||
|
||||
// printf("### rlen=%d \n",rlen);
|
||||
if (rlen < 0 || rlen > p_end - p) {
|
||||
mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%d\n", rlen);
|
||||
if (rlen > p_end - p) {
|
||||
mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%u\n", rlen);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -144,7 +144,7 @@ static void list_formats(void)
|
||||
{
|
||||
mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
|
||||
AVInputFormat *fmt = NULL;
|
||||
while (fmt = av_iformat_next(fmt))
|
||||
while ((fmt = av_iformat_next(fmt)))
|
||||
mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
|
||||
}
|
||||
|
||||
|
@ -1549,7 +1549,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es,
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if(((stream_id >= 0xe0) && (stream_id <= 0xef)) || (stream_id == 0xfd && type_from_pmt != UNKNOWN))
|
||||
else if((stream_id >= 0xe0 && stream_id <= 0xef) || (stream_id == 0xfd && type_from_pmt != UNKNOWN))
|
||||
{
|
||||
es->start = p;
|
||||
es->size = packet_len;
|
||||
@ -1563,7 +1563,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es,
|
||||
mp_msg(MSGT_DEMUX, MSGL_DBG2, "pes_parse2: M2V size %d\n", es->size);
|
||||
return 1;
|
||||
}
|
||||
else if ((stream_id == 0xfa))
|
||||
else if (stream_id == 0xfa)
|
||||
{
|
||||
int l;
|
||||
|
||||
|
@ -515,6 +515,6 @@ int parse_timestring(const char *str, double *time, char endchar);
|
||||
#define OPT_SETTINGSLIST(optname, varname, flags, objlist) {optname, NULL, &m_option_type_obj_settings_list, flags, 0, 0, objlist, 1, offsetof(struct MPOpts, varname)}
|
||||
#define OPT_AUDIOFORMAT(optname, varname, flags) {optname, NULL, &m_option_type_afmt, flags, 0, 0, NULL, 1, offsetof(struct MPOpts, varname)}
|
||||
#define OPT_HELPER_REMOVEPAREN(...) __VA_ARGS__
|
||||
#define OPT_CHOICE(optname, varname, flags, choices) {optname, NULL, &m_option_type_choice, flags, 0, 0, &(const struct m_opt_choice_alternatives[]){OPT_HELPER_REMOVEPAREN choices, {NULL}}, 1, offsetof(struct MPOpts, varname)}
|
||||
#define OPT_CHOICE(optname, varname, flags, choices) {optname, NULL, &m_option_type_choice, flags, 0, 0, (void *)&(const struct m_opt_choice_alternatives[]){OPT_HELPER_REMOVEPAREN choices, {NULL}}, 1, offsetof(struct MPOpts, varname)}
|
||||
|
||||
#endif /* MPLAYER_M_OPTION_H */
|
||||
|
@ -2248,7 +2248,7 @@ static void mp_dvdnav_reset_stream (MPContext *ctx) {
|
||||
/// free audio packets and reset
|
||||
ds_free_packs(ctx->d_audio);
|
||||
audio_delay -= ctx->sh_audio->stream_delay;
|
||||
ctx->delay =- audio_delay;
|
||||
ctx->delay = -audio_delay;
|
||||
ao_reset(ctx->ao);
|
||||
resync_audio_stream(ctx->sh_audio);
|
||||
}
|
||||
|
@ -614,9 +614,10 @@ autherr:
|
||||
convert_timestamp(str, &e_ss, &e_ms);
|
||||
free(str);
|
||||
}
|
||||
str = buf + sprintf(buf, s_ms ? "%s%d.%d-" : "%s%d-", "Range: npt=", s_ss, s_ms);
|
||||
if (e_ss || e_ms)
|
||||
sprintf(str, e_ms ? "%d.%d" : "%d", e_ss, e_ms);
|
||||
if (s_ms) str = buf + sprintf(buf, "%s%d.%d-", "Range: npt=", s_ss, s_ms);
|
||||
else str = buf + sprintf(buf, "%s%d-" , "Range: npt=", s_ss );
|
||||
if (e_ms) sprintf(str, "%d.%d", e_ss, e_ms);
|
||||
else if (e_ss) sprintf(str, "%d", e_ss );
|
||||
}
|
||||
rtsp_schedule_field(rtsp_session, buf);
|
||||
/* and finally send a play request */
|
||||
|
Loading…
Reference in New Issue
Block a user