Mercurial > mplayer.hg

comparison libvo/aspect.c @ 32395:aca925e56969

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix handling of invalid values in aspect_save_screenres to not overwrite valid values.
author reimar
date Mon, 11 Oct 2010 17:09:33 +0000
parents 3a6a61ffbb34
children 94979f661d38
comparison
equal deleted inserted replaced
32394:914208d188b9 32395:aca925e56969
69 69
70 void aspect_save_screenres(int scrw, int scrh){ 70 void aspect_save_screenres(int scrw, int scrh){
71 #ifdef ASPECT_DEBUG 71 #ifdef ASPECT_DEBUG
72 printf("aspect_save_screenres %dx%d \n",scrw,scrh); 72 printf("aspect_save_screenres %dx%d \n",scrw,scrh);
73 #endif 73 #endif
74 if (!scrw && !scrh) { 74 if (scrw <= 0 && scrh <= 0)
75 scrw = 1024; 75 scrw = 1024;
76 scrh = 768; 76 if (scrh <= 0)
77 } else if (scrw) {
78 scrh = (scrw * 3 + 3) / 4; 77 scrh = (scrw * 3 + 3) / 4;
79 } else 78 if (scrw <= 0)
80 scrw = (scrh * 4 + 2) / 3; 79 scrw = (scrh * 4 + 2) / 3;
81 aspdat.scrw = scrw; 80 aspdat.scrw = scrw;
82 aspdat.scrh = scrh; 81 aspdat.scrh = scrh;
83 if (force_monitor_aspect) 82 if (force_monitor_aspect)
84 monitor_aspect = force_monitor_aspect; 83 monitor_aspect = force_monitor_aspect;