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 /libmenu | |
| 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 'libmenu')
| -rw-r--r-- | libmenu/menu_filesel.c | 2 | ||||
| -rw-r--r-- | libmenu/vf_menu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 92d9728658..d656c11c70 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -241,7 +241,7 @@ static int open_dir(menu_t* menu,char* args) { if(dp->d_name[0] == '.' && strcmp(dp->d_name,"..") != 0) continue; if (menu_chroot && !strcmp (dp->d_name,"..")) { - int len = strlen (menu_chroot); + size_t len = strlen (menu_chroot); if ((strlen (mpriv->dir) == len || strlen (mpriv->dir) == len + 1) && !strncmp (mpriv->dir, menu_chroot, len)) continue; diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 2cd68f3205..0cbf35cf53 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -215,7 +215,7 @@ static int config(struct vf_instance* vf, int width, int height, int d_width, in } static int query_format(struct vf_instance* vf, unsigned int fmt){ - return (vf_next_query_format(vf,fmt)); + return vf_next_query_format(vf, fmt); } static int open_vf(vf_instance_t *vf, char* args){ |