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 /vidix/unichrome_vid.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 'vidix/unichrome_vid.c')
| -rw-r--r-- | vidix/unichrome_vid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c index e146e91702..15b86fc662 100644 --- a/vidix/unichrome_vid.c +++ b/vidix/unichrome_vid.c @@ -651,7 +651,7 @@ static int unichrome_get_gkey (vidix_grkey_t * grkey) { memcpy (grkey, &uc_grkey, sizeof (vidix_grkey_t)); - return (0); + return 0; } /** @@ -687,7 +687,7 @@ unichrome_set_gkey (const vidix_grkey_t * grkey) /* Execute the changes */ VIDEO_OUT (vio, V_COMPOSE_MODE, dwCompose | V1_COMMAND_FIRE); - return (0); + return 0; } /** |