Mercurial > libavcodec.hg
diff h263dec.c @ 5887:83ac4620c6ed libavcodec
intrax8 decoder patch by "someone"
author | michael |
---|---|
date | Fri, 09 Nov 2007 21:37:48 +0000 |
parents | 7622ba533e05 |
children | 80103098c797 |
line wrap: on
line diff
--- a/h263dec.c Thu Nov 08 10:53:32 2007 +0000 +++ b/h263dec.c Fri Nov 09 21:37:48 2007 +0000 @@ -623,9 +623,10 @@ //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 @@ } } +intrax8_decoded: ff_er_frame_end(s); MPV_frame_end(s);