diff options
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 3d60fc1d90..93d578415c 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -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); |