diff options
| author | wm4 <wm4@nowhere> | 2017-07-21 20:19:39 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-07-21 20:19:39 +0200 |
| commit | 2378acc3b3e9825765c549e025bc1ca83064cced (patch) | |
| tree | 186f115fad588eeccec369690cbd594788f8331a /options | |
| parent | 533ff28574ef179524a1f25b0b145d92137457a7 (diff) | |
| download | mpv-2378acc3b3e9825765c549e025bc1ca83064cced.tar.bz2 mpv-2378acc3b3e9825765c549e025bc1ca83064cced.tar.xz | |
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.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
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), |