summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-01 08:18:50 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-01 08:18:50 +0300
commitbec3b84f5ef798ab843028dd62018571a50330ed (patch)
treea1805e73289111518e6343d255da1085736cb7f1 /libvo
parent9d27862072a233b423d4a81e966b1ba9627724a6 (diff)
parent19c9e0aceb9620c862cab91b509df91931821d66 (diff)
downloadmpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2
mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz
Merge svn changes up to r26624
Conflicts: Makefile
Diffstat (limited to 'libvo')
-rw-r--r--libvo/aspecttest.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/aspecttest.c b/libvo/aspecttest.c
index 14791dfcb7..350db61290 100644
--- a/libvo/aspecttest.c
+++ b/libvo/aspecttest.c
@@ -11,6 +11,8 @@
#define DEF_ZOOM 1
extern float monitor_aspect;
+int vo_fs;
+float vo_panscan;
int main(int argc, char *argv[]) {
int w,h,z=DEF_ZOOM;