diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /libvo/vosub_vidix.c | |
parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'libvo/vosub_vidix.c')
-rw-r--r-- | libvo/vosub_vidix.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |