diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
| commit | fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f (patch) | |
| tree | c78705f95df4143bc28d19db6ad36df2ab2cf215 /libmpcodecs | |
| parent | 92e5414897707d998b4ba46664709347760f5b11 (diff) | |
| parent | 82118dc35edfbf9b6714e1e4e6b1823fc3205ff7 (diff) | |
| download | mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.bz2 mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.xz | |
Merge remote-tracking branch 'wm4/window_title'
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 21c940b9be..564ad2a911 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -321,9 +321,8 @@ int mpcodecs_config_vo2(sh_video_t *sh, int w, int h, // Time to config libvo! mp_msg(MSGT_CPLAYER, MSGL_V, - "VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", sh->disp_w, - sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, "MPlayer", - out_fmt); + "VO Config (%dx%d->%dx%d,flags=%d,0x%X)\n", sh->disp_w, + sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, out_fmt); vf->w = sh->disp_w; vf->h = sh->disp_h; diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 2d9514d3d2..d673c7bcd4 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -79,7 +79,7 @@ static int config(struct vf_instance *vf, vf->default_caps=query_format(vf,outfmt); vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice; - if (vo_config(video_out, width, height, d_width, d_height, flags, "MPlayer", outfmt)) + if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt)) return 0; #ifdef CONFIG_ASS |