summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cfg-common.h4
-rw-r--r--libmpcodecs/vd.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 33b5a94d12..624e74148d 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -131,7 +131,7 @@
{"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL},
- {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
+ {"xy", &screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 4096, NULL},
{"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
{"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
@@ -180,7 +180,7 @@
#include "config.h"
// codec/filter opts: (defiend at libmpcodecs/vd.c)
-extern int screen_size_xy;
+extern float screen_size_xy;
extern float movie_aspect;
extern int softzoom;
extern int flip;
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index c8e6756008..917b8d24f3 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -121,7 +121,7 @@ int softzoom=0;
int flip=-1;
int opt_screen_size_x=0;
int opt_screen_size_y=0;
-int screen_size_xy=0;
+float screen_size_xy=0;
float movie_aspect=-1.0;
int vo_flags=0;
int vd_use_slices=1;