Mercurial > mplayer.hg

changeset 36272:aa0011dfbfdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use again special value -1 to set original aspect ratio. With -1, the switch_ratio command does exactly the calculation being performed here. This reverts changes in setting the value for the aspect ratio made in r36358 and r36360.
author ib
date Sat, 27 Jul 2013 22:25:57 +0000
parents 1a889d9a4540
children 55cac32d68c2
files gui/ui/actions.c gui/win32/gui.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/actions.c	Sat Jul 27 21:16:06 2013 +0000
+++ b/gui/ui/actions.c	Sat Jul 27 22:25:57 2013 +0000
@@ -440,7 +440,7 @@
 
         case 1:
         default:
-            aspect = (float)guiInfo.sh_video->disp_w / guiInfo.sh_video->disp_h;
+            aspect = -1;
         }
 
         snprintf(cmd, sizeof(cmd), "switch_ratio %f", aspect);
--- a/gui/win32/gui.c	Sat Jul 27 21:16:06 2013 +0000
+++ b/gui/win32/gui.c	Sat Jul 27 22:25:57 2013 +0000
@@ -485,7 +485,7 @@
                             aspect = 2.35;
                             break;
                         default:
-                            aspect = (float) guiInfo.sh_video->disp_w / guiInfo.sh_video->disp_h;
+                            aspect = -1;
                             break;
                     }
                     snprintf(cmd, sizeof(cmd), "switch_ratio %f", aspect);