[SCM] libav/experimental: HALFPQ should be used only for when PQUANT is selected

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a9d78ac51a6ef9d31cd64c49720db2ca23cc905b
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Sat Sep 15 09:24:53 2007 +0000

    HALFPQ should be used only for when PQUANT is selected
    
    Originally committed as revision 10500 to svn://svn.ffmpeg.org/ffmpeg/trunk

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;

-- 
Libav/FFmpeg packaging