intrax8 decoder patch by "someone"

Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-11-09 21:37:48 +00:00
parent a9d5a4485a
commit 9abc7e0fdc
12 changed files with 2345 additions and 13 deletions

View File

@ -623,9 +623,10 @@ retry:
//the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type
//which is not available before MPV_frame_start()
if (s->msmpeg4_version==5){
if(!ENABLE_WMV2_DECODER || ff_wmv2_decode_secondary_picture_header(s) < 0)
return -1;
if (ENABLE_WMV2_DECODER && s->msmpeg4_version==5){
ret = ff_wmv2_decode_secondary_picture_header(s);
if(ret<0) return ret;
if(ret==1) goto intrax8_decoded;
}
/* decode each macroblock */
@ -682,6 +683,7 @@ retry:
}
}
intrax8_decoded:
ff_er_frame_end(s);
MPV_frame_end(s);