summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-07 15:12:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-07 15:12:29 +0000
commit83b056b09ea77ccee8fc396da2d723e4fac9953a (patch)
tree700f3ab8a7707f0d453b999ae886b240c041d217 /libvo
parent828a3a2f10a4814b75472de6f6431237e0ab0870 (diff)
downloadmpv-83b056b09ea77ccee8fc396da2d723e4fac9953a.tar.bz2
mpv-83b056b09ea77ccee8fc396da2d723e4fac9953a.tar.xz
Change conflicting function declaration between .c and .h file, causing a
compilation failure on Cygwin, checked by Sascha Sommer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vosub_vidix.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index 0fe70a63c8..bc842b2549 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -22,7 +22,7 @@ int vidix_start(void);
int vidix_stop(void);
void vidix_term( void );
uint32_t vidix_control(uint32_t request, void *data, ...);
-uint32_t vidix_query_fourcc(unsigned fourcc);
+uint32_t vidix_query_fourcc(uint32_t fourcc);
uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
uint32_t vidix_draw_frame(uint8_t *src[]);