[MPlayer-cvslog] r32481 - trunk/libvo/aspect.c

[reimar]

Author: reimar
Date: Mon Oct 11 19:09:33 2010
New Revision: 32481

Log:
Fix handling of invalid values in aspect_save_screenres to not overwrite
valid values.

Modified:
   trunk/libvo/aspect.c

Modified: trunk/libvo/aspect.c
==============================================================================
--- trunk/libvo/aspect.c	Mon Oct 11 14:33:57 2010	(r32480)
+++ trunk/libvo/aspect.c	Mon Oct 11 19:09:33 2010	(r32481)
@@ -71,12 +71,11 @@ void aspect_save_screenres(int scrw, int
 #ifdef ASPECT_DEBUG
   printf("aspect_save_screenres %dx%d \n",scrw,scrh);
 #endif
-  if (!scrw && !scrh) {
+  if (scrw <= 0 && scrh <= 0)
     scrw = 1024;
-    scrh = 768;
-  } else if (scrw) {
+  if (scrh <= 0)
     scrh = (scrw * 3 + 3) / 4;
-  } else
+  if (scrw <= 0)
     scrw = (scrh * 4 + 2) / 3;
   aspdat.scrw = scrw;
   aspdat.scrh = scrh;