diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
tree | a838e509fdc2468220466e6337097b3ef590b00c /libvo/vosub_vidix.c | |
parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'libvo/vosub_vidix.c')
-rw-r--r-- | libvo/vosub_vidix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index b9ff829faa..dee4a9e273 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -319,17 +319,17 @@ uint32_t vidix_query_fourcc(uint32_t format) int vidix_grkey_support(void) { - return(vidix_fourcc.flags & VID_CAP_COLORKEY); + return vidix_fourcc.flags & VID_CAP_COLORKEY; } int vidix_grkey_get(vidix_grkey_t *gr_key) { - return(vdlGetGrKeys(vidix_handler, gr_key)); + return vdlGetGrKeys(vidix_handler, gr_key); } int vidix_grkey_set(const vidix_grkey_t *gr_key) { - return(vdlSetGrKeys(vidix_handler, gr_key)); + return vdlSetGrKeys(vidix_handler, gr_key); } |