diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /libvo/vosub_vidix.h | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'libvo/vosub_vidix.h')
-rw-r--r-- | libvo/vosub_vidix.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index d5a96fcfc8..708db684f6 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -27,11 +27,6 @@ void vidix_term( void ); uint32_t vidix_control(uint32_t request, void *data); uint32_t vidix_query_fourcc(uint32_t fourcc); -int vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y); -int vidix_draw_frame(uint8_t *src[]); -void vidix_flip_page(void); -void vidix_draw_osd(void); - #include "vidix/vidix.h" /* graphic keys */ int vidix_grkey_support(void); |