[MPlayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.146,1.147

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv3731

Modified Files:
	demux_mov.c 
Log Message:
Partially revert 1.140, restoring the old behaviour for all codecs 
except for twos and sowt.


Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- demux_mov.c	22 Apr 2006 05:12:10 -0000	1.146
+++ demux_mov.c	23 Apr 2006 11:38:06 -0000	1.147
@@ -1911,9 +1911,12 @@
     {
 	mp_msg(MSGT_DEMUX, MSGL_DBG2, "WARNING! Samplesize(%d) != 1\n",
 	    trak->samplesize);
-//	x=trak->chunks[trak->pos].size*trak->samplesize;
+	if((trak->fourcc != MOV_FOURCC('t','w','o','s')) && (trak->fourcc != MOV_FOURCC('s','o','w','t')))
+	    x=trak->chunks[trak->pos].size*trak->samplesize;
+	else
+	    x=trak->chunks[trak->pos].size;
     }
-//    else
+    else
 	x=trak->chunks[trak->pos].size;
 //    printf("X = %d\n", x);
     /* the following stuff is audio related */