HALFPQ should be used only for when PQUANT is selected

Originally committed as revision 10500 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago · a9d78ac51a
parent f7d2a43707
commit a9d78ac51a
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@ -2562,7 +2562,7 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c
    ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
    ac_val2 = ac_val;

-    scale = mquant * 2 + v->halfpq;
+    scale = mquant * 2 + ((mquant == v->pq) ? v->halfpq : 0);

    if(dc_pred_dir) //left
        ac_val -= 16;