summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-09-15 09:24:53 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-09-15 09:24:53 +0000
commita9d78ac51a6ef9d31cd64c49720db2ca23cc905b (patch)
treece4bec7508aee8a6897524ae4370b28f5c96ac4d
parentf7d2a43707a765fd99dea21913b3616b7559d9e6 (diff)
HALFPQ should be used only for when PQUANT is selected
Originally committed as revision 10500 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 4f19dc29fe..ceb052528f 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;