Mercurial > mplayer.hg

diff command.c @ 36317:56f576e4a49d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Be more consistent with movie aspect setting and check. Harmonize option "-aspect" with prescaling check and don't allow arbitrary values for command switch_ratio / variable movie_aspect.
author ib
date Wed, 07 Aug 2013 21:06:59 +0000
parents 139f2b064ef9
children e24ada1fc15f
line wrap: on
line diff
--- a/command.c	Wed Aug 07 20:41:34 2013 +0000
+++ b/command.c	Wed Aug 07 21:06:59 2013 +0000
@@ -2719,8 +2719,11 @@
                 break;
             if (cmd->nargs == 0)
                 movie_aspect = -1.0;
+            else if (cmd->args[0].v.f == -1 || cmd->args[0].v.f >= 0)
+                movie_aspect = cmd->args[0].v.f;
             else
-                movie_aspect = cmd->args[0].v.f;
+                mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_InvalidSwitchRatio,
+                       cmd->args[0].v.f);
             mpcodecs_config_vo(sh_video, sh_video->disp_w, sh_video->disp_h, 0);
             break;