[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.66,1.67

[Arpi of Ize]

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

Modified Files:
	demux_mov.c 
Log Message:
fixed endless 'unknown chunk' and doublespeed ima4 audio bugs

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- demux_mov.c	30 Jun 2002 00:37:02 -0000	1.66
+++ demux_mov.c	6 Jul 2002 15:14:32 -0000	1.67
@@ -873,11 +873,14 @@
 			mp4_free_esds(&esds); // freeup esds mem
 		      }	      
 		      break;
+		    case 0:
+		      break;
 		    default:
 	      	      mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: Found unknown movie atom %c%c%c%c (%d)!\n",
 	      		  trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],
 	      		  atom_len);
 		   }
+		   if(atom_len<8) break;
 		   pos+=atom_len;
 //		   printf("pos=%d max=%d\n",pos,trak->stdata_len);
 		  }
@@ -1302,8 +1305,8 @@
       if(trak->stdata_len>=44 && trak->stdata[9]>=1){
         // stsd version 1 - we have audio compression ratio info:
 	x/=char2int(trak->stdata,28); // samples/packet
-	x*=char2int(trak->stdata,32); // bytes/packet
-//	x*=char2int(trak->stdata,36); // bytes/frame
+//	x*=char2int(trak->stdata,32); // bytes/packet
+	x*=char2int(trak->stdata,36); // bytes/frame
       } else {
 	if(ds->ss_div!=1 || ds->ss_mul!=1){
 	    // workaround for buggy files like 7up-high-traffic-areas.mov,