summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-03-24 16:04:13 +0000
committerRicardo Constantino <wiiaboo@gmail.com>2017-03-24 16:23:39 +0000
commitaae0833fc6f0fad40739832504328a47f9318643 (patch)
tree7f235d4c9c2a56b14c5b31973b3d0e399b59f67f
parentbc8710a98d5b1ea56fcb7f81a5c8bc4305481686 (diff)
downloadmpv-aae0833fc6f0fad40739832504328a47f9318643.tar.bz2
mpv-aae0833fc6f0fad40739832504328a47f9318643.tar.xz
osc: fix PlayResX undefined warning when aspect is 0
-rw-r--r--player/lua/osc.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index a9c5f503ca..8997ae4ac6 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -1487,8 +1487,10 @@ function osc_init()
osc_param.unscaled_y = display_h
end
osc_param.playresy = osc_param.unscaled_y / scale
- osc_param.playresx = osc_param.playresy * display_aspect
- osc_param.display_aspect = display_aspect
+ if (display_aspect > 0) then
+ osc_param.display_aspect = display_aspect
+ end
+ osc_param.playresx = osc_param.playresy * osc_param.display_aspect
@@ -2031,7 +2033,8 @@ function render()
end
-- submit
- mp.set_osd_ass(osc_param.playresy * aspect, osc_param.playresy, ass.text)
+ mp.set_osd_ass(osc_param.playresy * osc_param.display_aspect,
+ osc_param.playresy, ass.text)