Commit 80e3a08c authored by Michael Niedermayer's avatar Michael Niedermayer

reverse zero packet dissapearence "feature"

Originally committed as revision 4046 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 68c6d60f
...@@ -416,8 +416,6 @@ resync: ...@@ -416,8 +416,6 @@ resync:
AVIStream *ast= st->priv_data; AVIStream *ast= st->priv_data;
int size; int size;
assert(ast->remaining);
if(ast->sample_size == 0) if(ast->sample_size == 0)
size= INT_MAX; size= INT_MAX;
else if(ast->sample_size < 32) else if(ast->sample_size < 32)
...@@ -528,7 +526,7 @@ resync: ...@@ -528,7 +526,7 @@ resync:
} }
//parse ##dc/##wb //parse ##dc/##wb
if(n < s->nb_streams && size){ if(n < s->nb_streams){
AVStream *st; AVStream *st;
AVIStream *ast; AVIStream *ast;
st = s->streams[n]; st = s->streams[n];
...@@ -632,14 +630,14 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -632,14 +630,14 @@ static int avi_read_idx1(AVFormatContext *s, int size)
#if defined(DEBUG_SEEK) #if defined(DEBUG_SEEK)
av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%d\n", len, ast->cum_len); av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%d\n", len, ast->cum_len);
#endif #endif
if(len) if(last_pos == pos)
avi->non_interleaved= 1;
else
av_add_index_entry(st, pos, ast->cum_len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); av_add_index_entry(st, pos, ast->cum_len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
if(ast->sample_size) if(ast->sample_size)
ast->cum_len += len / ast->sample_size; ast->cum_len += len / ast->sample_size;
else else
ast->cum_len ++; ast->cum_len ++;
if(last_pos == pos)
avi->non_interleaved= 1;
last_pos= pos; last_pos= pos;
} }
return 0; return 0;
......
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