Commit 7f0e747d authored by michael's avatar michael

Support wb00+dc00 chunk mix.

fixes issue402


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12609 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bbfa5d98
...@@ -778,10 +778,29 @@ resync: ...@@ -778,10 +778,29 @@ resync:
//parse ##dc/##wb //parse ##dc/##wb
if(n < s->nb_streams){ if(n < s->nb_streams){
AVStream *st; AVStream *st;
AVStream *st1 = s->streams[1];
AVIStream *ast1= st1->priv_data;
AVIStream *ast; AVIStream *ast;
st = s->streams[n]; st = s->streams[n];
ast = st->priv_data; ast = st->priv_data;
//workaround for broken small-file-bug402.avi
if( d[2] == 'w' && d[3] == 'b'
&& n==0
&& s->nb_streams>=2
&& st ->codec->codec_type == CODEC_TYPE_VIDEO
&& st1->codec->codec_type == CODEC_TYPE_AUDIO
&& ast->prefix == 'd'*256+'c'
&& (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count)
){
n=1;
st = st1;
ast = ast1;
av_log(s, AV_LOG_WARNING, "Invalid stream+prefix combination, assuming audio\n");
}
if( (st->discard >= AVDISCARD_DEFAULT && size==0) if( (st->discard >= AVDISCARD_DEFAULT && size==0)
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering
|| st->discard >= AVDISCARD_ALL){ || st->discard >= AVDISCARD_ALL){
......
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