OSDN Git Service

When tracking non-zero coefficients during Indeo 5 decoding, make sure
authorMaxim Poliakovski <max_pole@gmx.de>
Sun, 7 Mar 2010 06:03:45 +0000 (06:03 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Sun, 7 Mar 2010 06:03:45 +0000 (06:03 +0000)
it does not ignore coefficient value = 256.
Patch by Maxim ((!min)_pole \at gmx dot/ de)

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

libavcodec/ivi_common.c

index ad08b44..e4cb42f 100644 (file)
@@ -413,7 +413,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile)
                     if (q > 1)
                         val = val * q + FFSIGN(val) * ((q >> 1) - (q & 1));
                     trvec[pos] = val;
-                    col_flags[pos & col_mask] |= val; /* track columns containing non-zero coeffs */
+                    col_flags[pos & col_mask] |= !!val; /* track columns containing non-zero coeffs */
                 }// while
 
                 if (scan_pos >= num_coeffs && sym != rvmap->eob_sym)