--- branches/dev-api-4/xvidcore/vfw/src/2pass.c 2003/02/22 08:24:01 889 +++ branches/dev-api-4/xvidcore/vfw/src/2pass.c 2003/03/26 14:56:49 949 @@ -1493,14 +1493,14 @@ /* XXX: vol/vop issues if (codec->config.quant_type == QUANT_MODE_MOD) { - frame->general |= (frame->quant < 4) ? XVID_MPEGQUANT : XVID_H263QUANT; - frame->general &= (frame->quant < 4) ? ~XVID_H263QUANT : ~XVID_MPEGQUANT; + frame->general |= (frame->quant < 4) ? XVID_VOL_MPEGQUANT : XVID_H263QUANT; + frame->general &= (frame->quant < 4) ? ~XVID_H263QUANT : ~XVID_VOL_MPEGQUANT; } if (codec->config.quant_type == QUANT_MODE_MOD_NEW) { - frame->general |= (frame->quant < 4) ? XVID_H263QUANT : XVID_MPEGQUANT; - frame->general &= (frame->quant < 4) ? ~XVID_MPEGQUANT : ~XVID_H263QUANT; + frame->general |= (frame->quant < 4) ? XVID_H263QUANT : XVID_VOL_MPEGQUANT; + frame->general &= (frame->quant < 4) ? ~XVID_VOL_MPEGQUANT : ~XVID_H263QUANT; } */ @@ -1524,7 +1524,7 @@ total_size = 0; } - quant_type = (stats->vol_flags & XVID_MPEGQUANT) ? "MPEG" : "H.263"; + quant_type = (stats->vol_flags & XVID_VOL_MPEGQUANT) ? "MPEG" : "H.263"; if (stats->type == XVID_TYPE_IVOP) frame_type = "IVOP"; else if (stats->type == XVID_TYPE_BVOP)