Mercurial > mplayer.hg

changeset 18218:a1ad37ef0a30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Partially revert 1.140, restoring the old behaviour for all codecs except for twos and sowt.
author rtognimp
date Sun, 23 Apr 2006 11:38:06 +0000
parents 0ca00f163c2e
children 2ea5d88eacd4
files libmpdemux/demux_mov.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Sun Apr 23 09:07:38 2006 +0000
+++ b/libmpdemux/demux_mov.c	Sun Apr 23 11:38:06 2006 +0000
@@ -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 */