From: Roman Shaposhnik <roman@shaposhnik.org>
Date: Tue, 7 Oct 2008 15:51:29 +0000 (+0000)
Subject: fixing a bug that prevented proper unweighting table to be selected
X-Git-Tag: v0.5~2241
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0843ddcb91cfd11eeeebbd62cfc4bcd340c1e87d;p=coroid%2Fffmpeg_saccubus.git

fixing a bug that prevented proper unweighting table to be selected

Originally committed as revision 15579 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index c0cdee91e..357baec29 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -410,7 +410,7 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
             if (DV_PROFILE_IS_HD(s->sys)) {
                 mb->idct_put = s->idct_put[0];
                 mb->scan_table = s->dv_zigzag[0];
-                mb->factor_table = s->dv100_idct_factor[((s->sys->height == 720)<<1)&(j < 4)][class1][quant];
+                mb->factor_table = s->dv100_idct_factor[((s->sys->height == 720)<<1)|(j >= 4)][class1][quant];
                 is_field_mode[mb_index] |= !j && dct_mode;
             } else {
                 mb->idct_put = s->idct_put[dct_mode && log2_blocksize==3];