summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demux/mf.c2
-rw-r--r--sub/sub.c2
-rw-r--r--video/img_format.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/demux/mf.c b/demux/mf.c
index daeb6baa79..98fab6edc4 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -50,7 +50,7 @@ mf_t* open_mf_pattern(char * filename)
#if defined(HAVE_GLOB) || defined(__MINGW32__)
glob_t gg;
int i;
- char * fname;
+ char * fname = NULL;
mf_t * mf;
int error_count = 0;
int count = 0;
diff --git a/sub/sub.c b/sub/sub.c
index fcfbca6954..2f51b7a8a5 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -53,7 +53,7 @@ float sub_fps = 0;
void *vo_spudec=NULL;
void *vo_vobsub=NULL;
-static const const struct osd_style_opts osd_style_opts_def = {
+static const struct osd_style_opts osd_style_opts_def = {
.font = "Sans",
.font_size = 45,
.color = {255, 255, 255, 255},
diff --git a/video/img_format.c b/video/img_format.c
index dfee130090..dfb82d2081 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -161,7 +161,7 @@ static struct mp_imgfmt_desc get_avutil_fmt(enum PixelFormat fmt)
struct mp_imgfmt_desc desc = {
.id = mpfmt,
.avformat = fmt,
- .name = mp_imgfmt_to_name(desc.id),
+ .name = mp_imgfmt_to_name(mpfmt),
.chroma_xs = pd->log2_chroma_w,
.chroma_ys = pd->log2_chroma_h,
};