Mercurial > libavformat.hg
changeset 984:b644fe79f7a2 libavformat
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
| author | michael |
|---|---|
| date | Wed, 01 Mar 2006 16:11:04 +0000 |
| parents | 558381bf97d2 |
| children | 7f8b1a1ac020 |
| files | avidec.c |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/avidec.c Wed Mar 01 15:42:07 2006 +0000 +++ b/avidec.c Wed Mar 01 16:11:04 2006 +0000 @@ -87,6 +87,7 @@ } static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){ + AVIContext *avi = s->priv_data; ByteIOContext *pb = &s->pb; int longs_pre_entry= get_le16(pb); int index_sub_type = get_byte(pb); @@ -98,6 +99,7 @@ AVStream *st; AVIStream *ast; int i; + int64_t last_pos= -1; // av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%Ld\n", // longs_pre_entry,index_type, entries_in_use, chunk_id, base); @@ -125,12 +127,16 @@ len &= 0x7FFFFFFF; //av_log(s, AV_LOG_ERROR, "pos:%Ld, len:%X\n", pos, len); - av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0); + if(last_pos == pos || pos == base - 8) + avi->non_interleaved= 1; + else + av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0); if(ast->sample_size) ast->cum_len += len / ast->sample_size; else ast->cum_len ++; + last_pos= pos; }else{ int64_t offset= get_le64(pb); int size = get_le32(pb);