# HG changeset patch # User rtognimp # Date 1145792286 0 # Node ID a1ad37ef0a3058e3abd150a0681a736ef573f032 # Parent 0ca00f163c2e2ff1c384360d93315ecd1e71704e Partially revert 1.140, restoring the old behaviour for all codecs except for twos and sowt. diff -r 0ca00f163c2e -r a1ad37ef0a30 libmpdemux/demux_mov.c --- 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 */