summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-20 17:23:17 +0100
committerwm4 <wm4@nowhere>2012-11-20 18:00:16 +0100
commitef75d0ff260fff688c23e72f86d437d8d1e59a58 (patch)
treef92a5a6076bc5feb1eeca81acc77797c37cd11d5 /core
parent2cdbaaf31c85b27923c1795b5c4e3e576cdb4567 (diff)
downloadmpv-ef75d0ff260fff688c23e72f86d437d8d1e59a58.tar.bz2
mpv-ef75d0ff260fff688c23e72f86d437d8d1e59a58.tar.xz
core: minor cleanups
Enable printf format warnings for set_osd_[t]msg. Remove the pointless assertion in mplayer.c (the assertion proved that the following NULL check is probably pointless, but leave that check anyway for robustness - it's not really clear whether it's needed).
Diffstat (limited to 'core')
-rw-r--r--core/mp_osd.h6
-rw-r--r--core/mplayer.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/core/mp_osd.h b/core/mp_osd.h
index 78957fb3bf..d0ebc02639 100644
--- a/core/mp_osd.h
+++ b/core/mp_osd.h
@@ -19,6 +19,8 @@
#ifndef MPLAYER_MP_OSD_H
#define MPLAYER_MP_OSD_H
+#include "compat/compiler.h"
+
#define OSD_MSG_TEXT 1
#define OSD_MSG_SUB_DELAY 2
#define OSD_MSG_SPEED 3
@@ -38,8 +40,8 @@
struct MPContext;
void set_osd_bar(struct MPContext *mpctx, int type,const char* name,double min,double max,double val);
-void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...);
-void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...);
+void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...) PRINTF_ATTRIBUTE(5,6);
+void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...) PRINTF_ATTRIBUTE(5,6);
void rm_osd_msg(struct MPContext *mpctx, int id);
// osd_function is the symbol appearing in the video status, such as OSD_PLAY
diff --git a/core/mplayer.c b/core/mplayer.c
index 32c86d2dc7..a760a3d8cc 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -1474,7 +1474,6 @@ static void add_seek_osd_messages(struct MPContext *mpctx)
"Chapter: %s", chapter);
talloc_free(chapter);
}
- assert(mpctx->master_demuxer);
if ((mpctx->add_osd_seek_info & OSD_SEEK_INFO_EDITION)
&& mpctx->master_demuxer)
{