Revision fecc146b

View differences:

libavcodec/mpeg12.c
338 338
        if (mb_type & MB_TYPE_ZERO_MV){
339 339
            assert(mb_type & MB_TYPE_CBP);
340 340

  
341
            /* compute dct type */
342
            if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var?
343
                !s->frame_pred_frame_dct) {
344
                s->interlaced_dct = get_bits1(&s->gb);
345
            }
346

  
347
            if (IS_QUANT(mb_type))
348
                s->qscale = get_qscale(s);
349

  
350 341
            s->mv_dir = MV_DIR_FORWARD;
351
            if(s->picture_structure == PICT_FRAME)
342
            if(s->picture_structure == PICT_FRAME){
343
                if(!s->frame_pred_frame_dct)
344
                    s->interlaced_dct = get_bits1(&s->gb);
352 345
                s->mv_type = MV_TYPE_16X16;
353
            else{
346
            }else{
354 347
                s->mv_type = MV_TYPE_FIELD;
355 348
                mb_type |= MB_TYPE_INTERLACED;
356 349
                s->field_select[0][0]= s->picture_structure - 1;
357 350
            }
351

  
352
            if (IS_QUANT(mb_type))
353
                s->qscale = get_qscale(s);
354

  
358 355
            s->last_mv[0][0][0] = 0;
359 356
            s->last_mv[0][0][1] = 0;
360 357
            s->last_mv[0][1][0] = 0;

Also available in: Unified diff