Revision 15025553 libavcodec/h263dec.c

View differences:

libavcodec/h263dec.c
30 30
#include "mpegvideo.h"
31 31
#include "h263_parser.h"
32 32
#include "mpeg4video_parser.h"
33
#include "msmpeg4.h"
33 34

  
34 35
//#define DEBUG
35 36
//#define PRINT_FRAME_TIME
......
110 111
        if (MPV_common_init(s) < 0)
111 112
            return -1;
112 113

  
113
    if (s->h263_msmpeg4)
114
    if (ENABLE_MSMPEG4_DECODER && s->h263_msmpeg4)
114 115
        ff_msmpeg4_decode_init(s);
115 116
    else
116 117
        h263_decode_init_vlc(s);
......
388 389
    }
389 390

  
390 391
    /* let's go :-) */
391
    if (s->msmpeg4_version==5) {
392
    if (ENABLE_WMV2_DECODER && s->msmpeg4_version==5) {
392 393
        ret= ff_wmv2_decode_picture_header(s);
393
    } else if (s->msmpeg4_version) {
394
    } else if (ENABLE_MSMPEG4_DECODER && s->msmpeg4_version) {
394 395
        ret = msmpeg4_decode_picture_header(s);
395 396
    } else if (s->h263_pred) {
396 397
        if(s->avctx->extradata_size && s->picture_number==0){
......
622 623
    //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type
623 624
    //which isnt available before MPV_frame_start()
624 625
    if (s->msmpeg4_version==5){
625
        if(ff_wmv2_decode_secondary_picture_header(s) < 0)
626
        if(!ENABLE_WMV2_DECODER || ff_wmv2_decode_secondary_picture_header(s) < 0)
626 627
            return -1;
627 628
    }
628 629

  
......
647 648
    }
648 649

  
649 650
    if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
650
        if(msmpeg4_decode_ext_header(s, buf_size) < 0){
651
        if(!ENABLE_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){
651 652
            s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR;
652 653
        }
653 654

  

Also available in: Unified diff