[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.57,1.58

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv23194

Modified Files:
	demux_mov.c 
Log Message:
get aspect info from display size if != real size

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- demux_mov.c	27 Mar 2002 21:27:38 -0000	1.57
+++ demux_mov.c	15 Apr 2002 01:58:18 -0000	1.58
@@ -885,8 +885,12 @@
 		if(!sh->disp_w && !sh->disp_h) {
 		  sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8);
 		  sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8);
-		}  
-
+		} else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){
+		  // codec and display width differ... use display one for aspect
+		  sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8);
+		  sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8);
+		}
+		
 		if(depth&(~15)) printf("*** depht = 0x%X\n",depth);
 
 		// palettized?