From a9d78ac51a6ef9d31cd64c49720db2ca23cc905b Mon Sep 17 00:00:00 2001
From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Sat, 15 Sep 2007 09:24:53 +0000
Subject: [PATCH] HALFPQ should be used only for when PQUANT is selected

Originally committed as revision 10500 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/vc1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 4f19dc2..ceb0525 100644
--- 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;
-- 
2.7.4