Commit e2b9cf4e authored by Michael Niedermayer's avatar Michael Niedermayer

update current_sample number for non split mode

fix chunk split decission

Originally committed as revision 4296 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 45139adf
......@@ -1942,14 +1942,13 @@ again:
}
#endif //MOV_MINOLTA_FIX
idx = sc->sample_to_chunk_index;
if (idx + 1 < sc->sample_to_chunk_sz && sc->next_chunk >= sc->sample_to_chunk[idx + 1].first)
idx++;
sc->sample_to_chunk_index = idx;
#ifdef MOV_SPLIT_CHUNKS
/* split chunks into samples */
if (sc->sample_size == 0) {
idx = sc->sample_to_chunk_index;
if ((idx + 1 < sc->sample_to_chunk_sz)
&& (sc->next_chunk >= sc->sample_to_chunk[idx + 1].first))
idx++;
sc->sample_to_chunk_index = idx;
if (sc->sample_size == 0 || sc->sample_size > 100) {
if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
mov->partial = sc;
/* we'll have to get those samples before next chunk */
......@@ -1958,6 +1957,8 @@ again:
}
sc->current_sample++;
}else if(idx + 1 < sc->sample_to_chunk_sz){
sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment