6 files changed, 9 insertions, 7 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index f3be8d174d..67a995c662 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -209,7 +209,9 @@ const struct vo_driver *video_out_drivers[] =
         &video_out_xvmc,
 #endif
 	&video_out_mpegpes,
+#ifdef HAVE_YUV4MPEG
 	&video_out_yuv4mpeg,
+#endif
 #ifdef HAVE_PNG
 	&video_out_png,
 #endif
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c
index 669b922a6d..c2565ef7ec 100644
--- a/libvo/vo_cvidix.c
+++ b/libvo/vo_cvidix.c
@@ -23,7 +23,7 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 
 static const vo_info_t info = {
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 68345ef2cc..f528bf0233 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -733,8 +733,8 @@ static uint32_t draw_image(mp_image_t *mpi) {
   mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP;
   mpi2.width = mpi2.w; mpi2.height = mpi2.h;
   if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) {
-    int bpp = mpi->imgfmt == IMGFMT_YV12 ? 1 : mpi->bpp;
-    memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp, mpi->h, mpi2.stride[0], mpi->stride[0]);
+    int bpp = mpi->imgfmt == IMGFMT_YV12 ? 8 : mpi->bpp;
+    memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp / 8, mpi->h, mpi2.stride[0], mpi->stride[0]);
     if (mpi->imgfmt == IMGFMT_YV12) {
       memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]);
       memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]);
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 2b35d6abfe..2581310596 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -25,7 +25,7 @@
 #include "mp_fifo.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 
 static const vo_info_t info = 
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 406aaaed44..f2136817ae 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -31,7 +31,7 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 #ifdef HAVE_NEW_GUI
 #include "gui/interface.h"
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index ac2f41aefe..da93ce571d 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
@@ -40,7 +40,7 @@
 
 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
 
-static VDL_HANDLE vidix_handler = NULL;
+static VDXContext *vidix_handler = NULL;
 static uint8_t *vidix_mem = NULL;
 static uint8_t next_frame;
 static unsigned image_Bpp,image_height,image_width,src_format,forced_fourcc=0;