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 | |
| 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')
| -rw-r--r-- | libvo/fastmemcpy.h | 1 | ||||
| -rw-r--r-- | libvo/font_load.h | 2 | ||||
| -rw-r--r-- | libvo/vo_xv.c | 5 | ||||
| -rw-r--r-- | libvo/vosub_vidix.c | 4 | ||||
| -rw-r--r-- | libvo/x11_common.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index ae9d2745e1..84d05e2c27 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -21,6 +21,7 @@ #include "config.h" #include <inttypes.h> +#include <string.h> #ifdef USE_FASTMEMCPY #if defined(HAVE_MMX) || defined(HAVE_MMX2) || defined(HAVE_3DNOW) \ diff --git a/libvo/font_load.h b/libvo/font_load.h index 0c7fe42890..44832d57f7 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -16,7 +16,7 @@ typedef struct { #endif } raw_file; -typedef struct { +typedef struct font_desc { #ifdef HAVE_FREETYPE int dynamic; #endif 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 { diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index a2146139e5..ac2f41aefe 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -646,8 +646,8 @@ int vidix_preinit(const char *drvname, struct vo_old_functions *server) mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CouldntGetCapability,strerror(err)); return -1; } - mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Description, vidix_cap.name); - mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Author, vidix_cap.author); + mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Description: %s.\n", vidix_cap.name); + mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Author: %s.\n", vidix_cap.author); /* we are able to tune up this stuff depend on fourcc format */ server->draw_slice=vidix_draw_slice; server->draw_frame=vidix_draw_frame; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 36e3570c6e..d40efd8735 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1600,7 +1600,7 @@ static int xss_suspend(Display *mDisplay, Bool suspend) if (XScreenSaverQueryExtension(mDisplay, &event, &error) != True || XScreenSaverQueryVersion(mDisplay, &major, &minor) != True) return 0; - if (major < 1 || major == 1 && minor < 1) + if (major < 1 || (major == 1 && minor < 1)) return 0; XScreenSaverSuspend(mDisplay, suspend); return 1; |