diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 11:38:06 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 11:38:06 +0000 |
| commit | c96851a3f0fd30f784203258e032969b6a4f8af8 (patch) | |
| tree | 1c0e9bdb300c7931db1c50abdeeab19e5fb7e1aa /libmpdemux | |
| parent | e1f05848d431f06a6dd992b2d4c14bdca0e99dbc (diff) | |
| download | mpv-c96851a3f0fd30f784203258e032969b6a4f8af8.tar.bz2 mpv-c96851a3f0fd30f784203258e032969b6a4f8af8.tar.xz | |
Partially revert 1.140, restoring the old behaviour for all codecs
except for twos and sowt.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18219 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index d7b1663ad2..eb084bb469 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1911,9 +1911,12 @@ if(trak->samplesize){ { 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 */ |