diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /libvo/vo_xv.c | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'libvo/vo_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 42bd45f473..dca050975e 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -824,8 +824,9 @@ static int preinit(struct vo *vo, const char *arg) if (!XvGrabPort(x11->display, xv_p, CurrentTime)) { x11->xv_port = xv_p; - mp_msg(MSGT_VO, MSGL_INFO, - MSGTR_LIBVO_XV_Adaptor, i, ctx->ai[i].name); + mp_msg(MSGT_VO, MSGL_V, + "[VO_XV] Using Xv Adapter #%d (%s)\n", + i, ctx->ai[i].name); break; } else { |