RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixing demuxing of minorityreport.AVI 

Originally committed as revision 5096 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-03-02 14:27:41 +00:00
parent 8d359bbabe
commit e84dab5f57
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avidec.c
View File

@ -403,6 +403,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
break; break;
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
get_wav_header(pb, st->codec, size); get_wav_header(pb, st->codec, size);
if(ast->sample_size && st->codec->block_align && ast->sample_size % st->codec->block_align)
av_log(s, AV_LOG_DEBUG, "invalid sample size or block align detected\n");
if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
url_fskip(pb, 1); url_fskip(pb, 1);
/* special case time: To support Xan DPCM, hardcode /* special case time: To support Xan DPCM, hardcode
@ -522,7 +524,7 @@ resync:
AVIStream *ast= st->priv_data; AVIStream *ast= st->priv_data;
int size; int size;
if(ast->sample_size == 0) if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM
size= INT_MAX; size= INT_MAX;
else if(ast->sample_size < 32) else if(ast->sample_size < 32)
size= 64*ast->sample_size; size= 64*ast->sample_size;
@ -850,7 +852,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
if (st2->nb_index_entries <= 0) if (st2->nb_index_entries <= 0)
continue; continue;
// assert(st2->codec.block_align); // assert(st2->codec->block_align);
assert(st2->time_base.den == ast2->rate); assert(st2->time_base.den == ast2->rate);
assert(st2->time_base.num == ast2->scale); assert(st2->time_base.num == ast2->scale);
index = av_index_search_timestamp( index = av_index_search_timestamp(