har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avidec: simplify avi_read_idx1()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-23 18:46:01 +02:00
parent 212f129fb8
commit d0f78e77e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avidec.c
View File

@ -1245,7 +1245,7 @@ static int avi_read_idx1(AVFormatContext *s, int size)
AVIStream *ast; AVIStream *ast;
unsigned int index, tag, flags, pos, len, first_packet = 1; unsigned int index, tag, flags, pos, len, first_packet = 1;
unsigned last_pos= -1; unsigned last_pos= -1;
unsigned last_len= 0; unsigned last_idx= -1;
int64_t idx1_pos, first_packet_pos = 0, data_offset = 0; int64_t idx1_pos, first_packet_pos = 0, data_offset = 0;
nb_index_entries = size / 16; nb_index_entries = size / 16;
@ -1292,12 +1292,12 @@ static int avi_read_idx1(AVFormatContext *s, int size)
// switch to non-interleaved to get correct timestamps // switch to non-interleaved to get correct timestamps
if(last_pos == pos) if(last_pos == pos)
avi->non_interleaved= 1; avi->non_interleaved= 1;
if((last_pos != pos || !last_len) && len) { if(last_idx != pos && len) {
av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
last_idx= pos;
} }
ast->cum_len += get_duration(ast, len); ast->cum_len += get_duration(ast, len);
last_pos= pos; last_pos= pos;
last_len= len;
} }
return 0; return 0;
} }