summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-30 23:01:46 +0200
committerwm4 <wm4@nowhere>2015-08-30 23:04:17 +0200
commit82f0d373fbecc18cd2ddc748f0b330160845f2cd (patch)
treea519cd102de6508c039ded4e2499caac67560f24 /options
parent061b947c843dd240a29b54e76d0ad002f6821b56 (diff)
downloadmpv-82f0d373fbecc18cd2ddc748f0b330160845f2cd.tar.bz2
mpv-82f0d373fbecc18cd2ddc748f0b330160845f2cd.tar.xz
video: make container vs. bitstream aspect ratio configurable
Utterly idiotic bullshit. Fixes #2259.
Diffstat (limited to 'options')
-rw-r--r--options/options.c2
-rw-r--r--options/options.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 2a62ef69c8..71aea336b1 100644
--- a/options/options.c
+++ b/options/options.c
@@ -312,6 +312,8 @@ const m_option_t mp_opts[] = {
// 0 means square pixels
OPT_FLOATRANGE("video-aspect", movie_aspect, 0, -1.0, 10.0),
OPT_FLOAT_STORE("no-video-aspect", movie_aspect, 0, 0.0),
+ OPT_CHOICE("video-aspect-method", aspect_method, 0,
+ ({"hybrid", 0}, {"bitstream", 1}, {"container", 2})),
OPT_CHOICE("field-dominance", field_dominance, 0,
({"auto", -1}, {"top", 0}, {"bottom", 1})),
diff --git a/options/options.h b/options/options.h
index b3d6bb18c2..5cf144a045 100644
--- a/options/options.h
+++ b/options/options.h
@@ -227,6 +227,7 @@ typedef struct MPOpts {
struct m_obj_settings *af_settings, *af_defs;
int deinterlace;
float movie_aspect;
+ int aspect_method;
int field_dominance;
char **sub_name;
char **sub_paths;