diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /libvo/video_out.h | |
parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'libvo/video_out.h')
-rw-r--r-- | libvo/video_out.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 7ad09a74a8..cc9544f4fb 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -291,9 +291,9 @@ typedef struct { float max; } range_t; -extern float range_max(range_t *r); -extern int in_range(range_t *r, float f); -extern range_t *str2range(char *s); +float range_max(range_t *r); +int in_range(range_t *r, float f); +range_t *str2range(char *s); extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; |