From 2378acc3b3e9825765c549e025bc1ca83064cced Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 21 Jul 2017 20:19:39 +0200
Subject: options: drop --video-aspect-method=hybrid

Remove this code because it could be argued that it contains GPL-only
code (see commit 642e963c860 for details).

The remaining aspect methods appear to work just as well, are
potentially more compatible to other players, and the code becomes much
simpler.
---
 options/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'options/options.c')

diff --git a/options/options.c b/options/options.c
index 56df6706ee..beceaf747f 100644
--- a/options/options.c
+++ b/options/options.c
@@ -443,7 +443,7 @@ const m_option_t mp_opts[] = {
     //  0 means square pixels
     OPT_ASPECT("video-aspect", movie_aspect, UPDATE_IMGPAR, -1.0, 10.0),
     OPT_CHOICE("video-aspect-method", aspect_method, UPDATE_IMGPAR,
-               ({"hybrid", 0}, {"bitstream", 1}, {"container", 2})),
+               ({"bitstream", 1}, {"container", 2})),
 
     OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0),
     OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0),
-- 
cgit v1.2.3