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/aspect.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/aspect.h')
| -rw-r--r-- | libvo/aspect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/aspect.h b/libvo/aspect.h index b803b99490..5fa313d7ff 100644 --- a/libvo/aspect.h +++ b/libvo/aspect.h @@ -3,8 +3,8 @@ /* Stuff for correct aspect scaling. */ struct vo; -extern void panscan_init(struct vo *vo); -extern void panscan_calc(struct vo *vo); +void panscan_init(struct vo *vo); +void panscan_calc(struct vo *vo); void aspect_save_orig(struct vo *vo, int orgw, int orgh); |