RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Only use odml index for files that need it 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12363 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ranma 2004-04-30 20:36:48 +00:00
parent cd7722e4ca
commit 4058e90588
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmpdemux/aviheader.c
View File

@ -225,9 +225,6 @@ while(1){
uint32_t i; uint32_t i;
unsigned msize = 0; unsigned msize = 0;
avisuperindex_chunk *s; avisuperindex_chunk *s;
// FIXME: do not use odml index for files that don't need it.
// apparently the odml code is buggy!
if (demuxer->movi_end < 0x7fffffff) break;
priv->suidx_size++; priv->suidx_size++;
priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk)); priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk));
s = &priv->suidx[priv->suidx_size-1]; s = &priv->suidx[priv->suidx_size-1];
@ -262,7 +259,6 @@ while(1){
(s->dwChunkId), i, (s->dwChunkId), i,
(uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration); (uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration);
} }
priv->isodml++;
break; } break; }
case ckidSTREAMFORMAT: { // read 'strf' case ckidSTREAMFORMAT: { // read 'strf'
@ -401,6 +397,15 @@ while(1){
if (strncmp(riff_type, "AVIX", sizeof riff_type)) if (strncmp(riff_type, "AVIX", sizeof riff_type))
mp_msg(MSGT_HEADER, MSGL_WARN, mp_msg(MSGT_HEADER, MSGL_WARN,
"** warning: this is no extended AVI header..\n"); "** warning: this is no extended AVI header..\n");
else {
/*
* We got an extended AVI header, so we need to switch to
* ODML to get seeking to work, provided we got indx chunks
* in the header (suidx_size > 0).
*/
if (priv->suidx_size > 0)
priv->isodml = 1;
}
chunksize = 0; chunksize = 0;
list_end = 0; /* a new list will follow */ list_end = 0; /* a new list will follow */
break; } break; }