Revision 7f125c3e libavcodec/mpeg12.c

View differences:

libavcodec/mpeg12.c
406 406
                }
407 407
                break;
408 408
            case MT_FIELD:
409
                if(s->progressive_sequence){
410
                    av_log(s->avctx, AV_LOG_ERROR, "MT_FIELD in progressive_sequence\n");
411
                    return -1;
412
                }
409 413
                s->mv_type = MV_TYPE_FIELD;
410 414
                if (s->picture_structure == PICT_FRAME) {
411 415
                    mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
......
443 447
                }
444 448
                break;
445 449
            case MT_DMV:
450
                if(s->progressive_sequence){
451
                    av_log(s->avctx, AV_LOG_ERROR, "MT_DMV in progressive_sequence\n");
452
                    return -1;
453
                }
446 454
                s->mv_type = MV_TYPE_DMV;
447 455
                for(i=0;i<2;i++) {
448 456
                    if (USES_LIST(mb_type, i)) {
......
1587 1595

  
1588 1596
    if(s->progressive_sequence && !s->frame_pred_frame_dct){
1589 1597
        av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n");
1590
        s->frame_pred_frame_dct= 1;
1591 1598
    }
1592 1599

  
1593 1600
    if(s->picture_structure == PICT_FRAME){

Also available in: Unified diff