changeset 6655:9eefcaf88e56

fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
author arpi
date Sat, 06 Jul 2002 15:14:32 +0000
parents 8047e1bdb4b0
children 92b29c3ed0c0
files libmpdemux/demux_mov.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Sat Jul 06 08:20:07 2002 +0000
+++ b/libmpdemux/demux_mov.c	Sat Jul 06 15:14:32 2002 +0000
@@ -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,