Revision 04b502fa

View differences:

libavcodec/mpeg12.c
418 418
                break;
419 419
            case MT_FIELD:
420 420
                s->mv_type = MV_TYPE_FIELD;
421
                for(i=0;i<2;i++) {
422
                    if (USES_LIST(mb_type, i)) {
423
                        s->mv_dir |= (MV_DIR_FORWARD >> i);
424
                        if (s->picture_structure == PICT_FRAME) {
425
                            mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
421
                if (s->picture_structure == PICT_FRAME) {
422
                    mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
423
                    for(i=0;i<2;i++) {
424
                        if (USES_LIST(mb_type, i)) {
425
                            s->mv_dir |= (MV_DIR_FORWARD >> i);
426 426
                            for(j=0;j<2;j++) {
427 427
                                s->field_select[i][j] = get_bits1(&s->gb);
428 428
                                val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
......
436 436
                                s->mv[i][j][1] = val;
437 437
                                dprintf(s->avctx, "fmy=%d\n", val);
438 438
                            }
439
                        } else {
440
                            mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
439
                        }
440
                    }
441
                } else {
442
                    mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
443
                    for(i=0;i<2;i++) {
444
                        if (USES_LIST(mb_type, i)) {
445
                            s->mv_dir |= (MV_DIR_FORWARD >> i);
441 446
                            s->field_select[i][0] = get_bits1(&s->gb);
442 447
                            for(k=0;k<2;k++) {
443 448
                                val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],

Also available in: Unified diff